diff --git a/packages/cad/.vscode/launch.json b/packages/cad/.vscode/launch.json index 543ae718..53101157 100644 --- a/packages/cad/.vscode/launch.json +++ b/packages/cad/.vscode/launch.json @@ -43,7 +43,7 @@ "sw", "--cache=true", "--src='./tests/html/*.+(SLDASM)'", - "--dst='${SRC_DIR}/${SRC_NAME}.+(step)'" + "--dst='${SRC_DIR}/${SRC_NAME}.+(html)'" ], "outputCapture": "std" }, diff --git a/packages/cad/dist/cad/sw-convert.js b/packages/cad/dist/cad/sw-convert.js index 0e326839..244a7256 100644 --- a/packages/cad/dist/cad/sw-convert.js +++ b/packages/cad/dist/cad/sw-convert.js @@ -3,7 +3,7 @@ import pMap from 'p-map'; import pkg from 'which'; const { sync: which } = pkg; import { resolve, OSR_CACHE } from '@polymech/commons'; -import { dirname, equalFiles, swProcMessage } from './sw-util.js'; +import { equalFiles, swProcMessage } from './sw-util.js'; import { reportCSV } from '../report/csv.js'; import { logger, substitute } from '../index.js'; import { removeEmpty } from '../lib/index.js'; @@ -197,7 +197,7 @@ export const convertFile = async (src, target, view, onNode = () => { }, options const bin = path.resolve(`${cwd}/${exe}`); if (!exists(bin)) { logger.error(`${bin} doesnt exists in ${cwd}`); - logger.error('__dirname:' + dirname()); + logger.error('dirname:' + import.meta.dirname); logger.error('options.sw ' + options.sw); return; } @@ -363,4 +363,4 @@ const on3DHTML = (src, dst, options: SolidworkOptions) => { write(dst, content); } */ -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sw-convert.js","sourceRoot":"","sources":["../../src/cad/sw-convert.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAC5B,OAAO,IAAI,MAAM,OAAO,CAAA;AACxB,OAAO,GAAG,MAAM,OAAO,CAAC;AACxB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAE7C,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,EAAE,IAAI,IAAI,MAAM,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,IAAI,IAAI,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,IAAI,IAAI,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,IAAI,IAAI,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAE9C,OAAO,EAAE,IAAI,IAAI,EAAE,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,SAAS,IAAI,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAE3D,OAAO,EAAE,yBAAyB,EAA4B,MAAM,eAAe,CAAA;AACnF,OAAO,EAAE,UAAU,EAAE,eAAe,EAAiB,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAExF,OAAO,EACH,WAAW,EACX,kBAAkB,EACrB,MAAM,iBAAiB,CAAA;AAExB,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,QAAQ,EAAqB,MAAM,cAAc,CAAA;AAExF,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAC5B,GAAG,EACH,MAAM,EACN,IAAY,EACZ,SAAyB,GAAG,EAAE,GAAG,CAAC,EAClC,OAAyB,EACzB,aAAqB,EAAE,EAAE;IACzB,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,aAAa,CAAA;IACtD,OAAO,CAAC,KAAK,IAAI,cAAc,CAAC,UAAU,CAAC,CAAA;IAC3C,MAAM,SAAS,GAAG,SAAS,EAAE,CAAA;IAC7B,IAAI,aAAa,GAAQ;QACrB,EAAE,EAAE,OAAO,CAAC,EAAE;QACd,GAAG;QACH,MAAM;QACN,aAAa;KAChB,CAAA;IACD,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,aAAa;YACb;gBACI,GAAG,aAAa;gBAChB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,QAAQ,EAAE,OAAO,CAAC,QAAQ;aAC7B,CAAA;IACL,CAAC;IACD,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3B,aAAa,GAAG;YACZ,GAAG,aAAa;YAChB,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC;YACnC,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC;YACnC,cAAc,EAAE,OAAO,CAAC,cAAc,CAAC;YACvC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC;YAC/B,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC;SACtC,CAAA;IACL,CAAC;IACD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;IACzE,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,GAAG,EAAE,UAAU,EAAE,WAAW,CAAC,CAAA;IAC3D,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE,UAAU,EAAE,WAAW,CAAC,CAAA;IACtE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QAClB,MAAM,GAAG,IAAI,CAAC;IAClB,CAAC;IACD,IAAI,SAAS,IAAI,MAAM,IAAI,UAAU,IAAI,OAAO,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;QAC7D,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC;YACrD,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;QACtC,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,IAAI,WAAW,4BAA4B,GAAG,OAAO,MAAM,EAAE,CAAC,CAAA;QAC3E,MAAM,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAA;QACtC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;IAC5B,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IAChC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACpC,IAAI,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,MAAM,CAAA;IAC7B,IAAI,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC9B,IAAI,OAAO,GAAG,EAAE,GAAG,MAAM,CAAA;IACzB,IAAI,MAAM,GAAG,IAAI,CAAA;IAEjB,oDAAoD;IACpD,IAAI,KAAK,CAAC,GAAG,KAAK,MAAM,IAAI,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,SAAS,IAAI,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAE,KAAK,MAAM,EAAE,CAAC;QACpH,MAAM,CAAC,KAAK,CAAC,IAAI,WAAW,gBAAgB,GAAG,OAAO,MAAM,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;QAClG,OAAO,CAAC,MAAM,GAAG,OAAO,CAAA;IAC5B,CAAC;IACD,IAAI,IAAI,GAAG;QACP,aAAa,GAAG,GAAG;QACnB,aAAa,MAAM,GAAG;QACtB,oBAAoB,aAAa,GAAG;QACpC,YAAY,IAAI,GAAG;QACnB,WAAW,GAAG,OAAO,CAAC,MAAM,IAAI,MAAM;QACtC,UAAU,GAAG,OAAO,CAAC,KAAK;QAC1B,WAAW,GAAG,OAAO,CAAC,MAAM;QAC5B,QAAQ,GAAG,OAAO,CAAC,GAAG;QACtB,aAAa,GAAG,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,YAAY;QAC9D,aAAa,OAAO,CAAC,OAAO,IAAI,yBAAyB,CAAC,oBAAoB,EAAE;KACnF,CAAA;IAED,IAAI,OAAO,CAAC,IAAI;QAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACrC,IAAI,OAAO,CAAC,IAAI;QAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACrC,IAAI,OAAO,CAAC,OAAO;QAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAC3C,IAAI,OAAO,CAAC,KAAK;QAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACvC,IAAI,OAAO,CAAC,KAAK;QAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IAEvC,IAAI,KAAK,CAAC,GAAG,KAAK,OAAO,IAAI,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,SAAS,EAAE,CAAC;QACxE,GAAG,GAAG,kBAAkB,CAAA;QACxB,IAAI,GAAG;YACH,aAAa,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG;YACjC,aAAa,OAAO,GAAG;SAC1B,CAAA;QACD,MAAM,GAAG,GAAG,EAAE;YACV,IAAI,CAAC;gBACD,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAU,CAAC;gBAC3C,IAAI,CAAC,KAAK,EAAE,CAAC;oBACT,MAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAA;oBAC9C,OAAO,KAAK,CAAA;gBAChB,CAAC;gBACD,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;gBAC9B,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;gBACrB,OAAO,IAAI,CAAA;YACf,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,MAAM,CAAC,KAAK,CAAC,4CAA4C,GAAG,OAAO,OAAO,EAAE,CAAC,CAAA;gBAC7E,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;gBAClB,OAAO,KAAK,CAAA;YAChB,CAAC;QACL,CAAC,CAAA;IACL,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,SAAS,EAAE,CAAC;QACvF,GAAG,GAAG,gBAAgB,CAAA;QACtB,IAAI,GAAG;YACH,aAAa,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG;YACjC,aAAa,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG;SACxC,CAAA;QACD,MAAM,GAAG,GAAG,EAAE;YACV,IAAI,CAAC;gBACD,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAU,CAAC;gBAC3C,IAAI,CAAC,KAAK,EAAE,CAAC;oBACT,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE,GAAG,CAAC,CAAA;oBACvD,OAAO,KAAK,CAAA;gBAChB,CAAC;gBACD,OAAO,IAAI,CAAA;YACf,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,MAAM,CAAC,KAAK,CAAC,mCAAmC,GAAG,OAAO,OAAO,EAAE,CAAC,CAAA;gBACpE,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;gBAClB,OAAO,KAAK,CAAA;YAChB,CAAC;QACL,CAAC,CAAA;IACL,CAAC;IACD,IAAI,KAAK,CAAC,GAAG,KAAK,OAAO,EAAE,CAAC;QACxB,GAAG,GAAG,gBAAgB,CAAA;QACtB,IAAI,CAAC,aAAa,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAChD,IAAI,GAAG;gBACH,IAAI,GAAG,GAAG;gBACV,IAAI,MAAM,GAAG;aAChB,CAAA;QACL,CAAC;aAAM,IAAI,aAAa,EAAE,CAAC;YACvB,4HAA4H;YAC5H,MAAM,aAAa,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,aAAa,OAAO,CAAC,CAAA;YACpF,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;gBACzB,MAAM,CAAC,KAAK,CAAC,wCAAwC,aAAa,gBAAgB,CAAC,CAAA;gBACnF,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;YAC5B,CAAC;YACD,IAAI,GAAG;gBACH,IAAI,aAAa,GAAG;gBACpB,IAAI,MAAM,GAAG;gBACb,GAAG,aAAa,EAAE;aACrB,CAAA;QACL,CAAC;IACL,CAAC;IACD,IAAI,KAAK,CAAC,GAAG,KAAK,OAAO,EAAE,CAAC;QACxB,GAAG,GAAG,SAAS,CAAC;QAChB,IAAI,GAAG;YACH,IAAI,GAAG,GAAG;YACV,IAAI,MAAM,GAAG;YACb,mBAAmB,OAAO,CAAC,YAAY,CAAC,EAAE;YAC1C,UAAU,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,YAAY,OAAO,CAAC,YAAY,CAAC,EAAE;SACtC,CAAA;QAED,OAAO,CAAC,YAAY,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAC9C,OAAO,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,cAAc,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC,CAAA;QAE7E,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YACnC,EAAE,CAAC,MAAM,CAAC,CAAC;QACf,CAAC;IACL,CAAC;IACD,IAAI,YAAY,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;QACjC,GAAG,GAAG,aAAa,CAAC;QACpB,IAAI,CAAC;YACD,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QACrC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,MAAM,CAAC,KAAK,CAAC,aAAa,GAAG,EAAE,CAAC,CAAC;YACjC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC7B,CAAC;QACD,IAAI,GAAG;YACH,IAAI,GAAG,GAAG;YACV,IAAI;YACJ,MAAM,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE;YAClC,GAAG,OAAO,CAAC,IAAI,EAAE;SACpB,CAAA;IACL,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC,CAAA;IACzC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,qBAAqB,GAAG,EAAE,CAAC,CAAA;QAC9C,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,OAAO,EAAE,CAAC,CAAA;QACtC,MAAM,CAAC,KAAK,CAAC,aAAa,GAAG,OAAO,CAAC,EAAE,CAAC,CAAA;QACxC,OAAM;IACV,CAAC;IACD,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;IAC3D,GAAG,CAAC,QAAQ,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAA;IACzC,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAA;IACjF,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;IAC3G,MAAM,IAAI,GAAG;QACT,GAAG,GAAG;QACN,GAAG;QACH,MAAM;QACN,MAAM,EAAE,MAAM;QACd,OAAO;KACV,CAAA;IAED,MAAM,MAAM,CAAC,IAAI,CAAC,CAAA;IAClB,MAAM,IAAI,MAAM,EAAE,CAAA;IAClB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,EAAE,CAAC,OAAO,CAAC,CAAA;QACX,OAAO,GAAG,CAAA;IACd,CAAC;IACD,SAAS,IAAI,OAAO,CAAC,KAAK,IAAI,IAAI,IAAI,MAAM,UAAU,CAAC,GAAG,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,CAAA;IAC3G,OAAO,CAAC,KAAK,IAAI,cAAc,CAAC,UAAU,CAAC,CAAA;IAC3C,OAAO,GAAG,CAAA;AACd,CAAC,CAAA;AACD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAI,EAAE,OAAiB,EAAE,IAAI,EAAE,SAA8B,GAAG,EAAE,GAAG,CAAC,EAAE,OAAyB;IAChI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,MAAM,CAAC,IAAI,CAAC,mBAAmB,IAAI,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAA,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;QAC1F,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;IAC5B,CAAC;IACD,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,MAAW,EAAE,EAAE;QACjC,OAAO,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;IACzF,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,CAAA;AAC1B,CAAC;AACD,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAI,EAAE,GAAW,EAAE,EAAE;IAExC,IAAI,MAAM,GAAQ,IAAI,CAAC;IACvB,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACtB,+BAA+B;IACnC,CAAC;IAED,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACvB,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;IAC5B,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC,CAAA;IACrC,MAAM,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAEzB,OAAO,MAAM,CAAC;AAClB,CAAC,CAAA;AACD,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAS,EAAE,OAAyB,EAAE,EAAE;IAC5D,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAC9B,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IAC1C,MAAM,OAAO,GAAG,EAAE,CAAA;IAElB,IAAI,cAAc,GAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,CAAA;IAC7C,IAAI,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;QAC/D,cAAc,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,CAAA;QAC5C,OAAO,cAAc,CAAC,SAAS,CAAC,CAAA;IACpC,CAAC;IACD,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC;QAChD,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,SAAS,EAAE,CAAC;QAC3C,MAAM,kBAAkB,GAAG,GAAG,QAAQ,CAAC,GAAG,IAAI,QAAQ,CAAC,IAAI,eAAe,CAAA;QAC1E,IAAI,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC;gBACD,cAAc,GAAG,IAAI,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAA;YACrD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,MAAM,CAAC,KAAK,CAAC,qCAAqC,kBAAkB,EAAE,CAAC,CAAC;YAC5E,CAAC;QACL,CAAC;IACL,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;QAChC,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YAC1B,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC1C,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAA;gBAClC,SAAS,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAA;gBAChC,SAAS,CAAC,aAAa,GAAG,IAAI,CAAA;gBAC9B,IAAI,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;gBAC/E,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;gBACrF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;gBACpC,IAAI,QAAQ,CAAC,GAAG,KAAK,KAAK,CAAC,GAAG,EAAE,CAAC;oBAC7B,OAAM;gBACV,CAAC;gBACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;oBACrB,IAAI,CAAC;wBACD,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;oBAClB,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACT,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;4BAChB,MAAM,CAAC,KAAK,CAAC,8BAA8B,KAAK,CAAC,GAAG,QAAQ,UAAU,EAAE,CAAC,CAAC;wBAC9E,CAAC;wBACD,OAAM;oBACV,CAAC;gBACL,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC;oBACT,MAAM,EAAE,UAAU;oBAClB,aAAa,EAAE,IAAI;iBACtB,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;QACN,CAAC;aAAM,CAAC;YACJ,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAA;YAClC,SAAS,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAA;YAChC,SAAS,CAAC,aAAa,GAAG,IAAI,CAAA;YAC9B,IAAI,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;YAC/E,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;gBACtB,IAAI,CAAC;oBACD,GAAG,CAAC,UAAU,CAAC,CAAA;gBACnB,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACT,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;wBAChB,MAAM,CAAC,KAAK,CAAC,8BAA8B,UAAU,EAAE,CAAC,CAAA;oBAC5D,CAAC;oBACD,OAAM;gBACV,CAAC;YACL,CAAC;YACD,OAAO,CAAC,IAAI,CAAC;gBACT,MAAM,EAAE,UAAU;gBAClB,aAAa,EAAE,IAAI;aACtB,CAAC,CAAA;QACN,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAA;AAClB,CAAC,CAAA;AACD,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAAyB;IACnD,MAAM,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAe,IAAI,MAAM,EAAE,CAAC,CAAA;IACnE,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAC/D,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrC,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;QACxD,OAAM;IACV,CAAC;IACD,+BAA+B;IAC/B,OAAO,CAAC,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QACvD,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,KAAK,CAAA;IACrC,CAAC,CAAC,CAAA;IAEF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACtD,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;QACnC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACtE,OAAO,YAAY,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;IAClE,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,CAAA;IAEtB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACjB,MAAM,aAAa,GAAW,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE;YACtE,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG;YACxB,GAAG,OAAO,CAAC,SAAS;YACpB,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,EAAE;SAC7C,CAAC,CAAC,CAAA;QACH,MAAM,CAAC,KAAK,CAAC,mBAAmB,aAAa,EAAE,CAAC,CAAA;QAChD,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;IAClC,CAAC;IACD,OAAO,GAAG,CAAA;AACd,CAAC;AACD;;;;;;;;;;;;;;;;;EAiBE"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sw-convert.js","sourceRoot":"","sources":["../../src/cad/sw-convert.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/cad/dist/cad/sw-pack.js b/packages/cad/dist/cad/sw-pack.js index 5a2fadab..72918bae 100644 --- a/packages/cad/dist/cad/sw-pack.js +++ b/packages/cad/dist/cad/sw-pack.js @@ -3,7 +3,7 @@ import pMap from 'p-map'; import { logger } from '../index.js'; import { Helper } from '../lib/process/index.js'; import { sync as exists } from "@polymech/fs/exists"; -import { getSWBin } from './sw-util.js'; +import { dirname, getSWBin } from './sw-util.js'; export async function packFile(file, onNode = () => { }, options) { if (options.dry) { return Promise.resolve(); @@ -25,7 +25,7 @@ export async function packFile(file, onNode = () => { }, options) { const bin = path.resolve(`${cwd}/${exe}`); if (!exists(bin)) { logger.error(`${bin} doesnt exists in ${cwd}`); - logger.error('__dirname:' + __dirname); + logger.error('__dirname:' + dirname()); logger.error('options.sw ' + options.sw); return; } @@ -50,4 +50,4 @@ export async function pack(options) { }, { concurrency: 1 }); return ret; } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3ctcGFjay5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jYWQvc3ctcGFjay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssSUFBSSxNQUFNLE1BQU0sQ0FBQTtBQUM1QixPQUFPLElBQUksTUFBTSxPQUFPLENBQUE7QUFDeEIsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUVwQyxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0seUJBQXlCLENBQUE7QUFDaEQsT0FBTyxFQUFFLElBQUksSUFBSSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQTtBQUNwRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBRXZDLE1BQU0sQ0FBQyxLQUFLLFVBQVUsUUFBUSxDQUFDLElBQUksRUFBRSxTQUE4QixHQUFHLEVBQUUsR0FBRyxDQUFDLEVBQUUsT0FBeUI7SUFDbkcsSUFBSSxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDZCxPQUFPLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUM3QixDQUFDO0lBQ0QsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQztJQUMzQixJQUFJLE9BQU8sQ0FBQyxLQUFLLElBQUksTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUM7UUFDbEMsTUFBTSxDQUFDO1lBQ0gsR0FBRyxFQUFFLElBQUk7WUFDVCxNQUFNO1NBQ1QsQ0FBQyxDQUFDO1FBQ0gsT0FBTyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDN0IsQ0FBQztJQUNELElBQUksR0FBRyxHQUFHLEVBQUUsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDO0lBQzlCLElBQUksSUFBSSxHQUFHO1FBQ1AsSUFBSSxJQUFJLEdBQUc7UUFDWCxJQUFJLE1BQU0sR0FBRztLQUNoQixDQUFBO0lBR0QsTUFBTSxHQUFHLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUNqQyxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsR0FBRyxJQUFJLEdBQUcsRUFBRSxDQUFDLENBQUM7SUFDMUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQ2YsTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLEdBQUcscUJBQXFCLEdBQUcsRUFBRSxDQUFDLENBQUE7UUFDOUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxZQUFZLEdBQUcsU0FBUyxDQUFDLENBQUE7UUFDdEMsTUFBTSxDQUFDLEtBQUssQ0FBQyxhQUFhLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUFBO1FBQ3hDLE9BQU07SUFDVixDQUFDO0lBRUQsT0FBTyxDQUFDLEtBQUssSUFBSSxNQUFNLENBQUMsS0FBSyxDQUFDLFdBQVcsR0FBRyxJQUFJLEdBQUcsT0FBTyxFQUFFLElBQUksQ0FBQyxDQUFBO0lBQ2pFLE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQ3pELE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUNmLE1BQU0sQ0FBQztZQUNILEdBQUcsQ0FBQztZQUNKLEdBQUcsRUFBRSxJQUFJO1lBQ1QsTUFBTTtTQUNULENBQUMsQ0FBQTtJQUNOLENBQUMsQ0FBQyxDQUFBO0lBQ0YsT0FBTyxPQUFPLENBQUE7QUFDbEIsQ0FBQztBQUVELE1BQU0sQ0FBQyxLQUFLLFVBQVUsSUFBSSxDQUFDLE9BQXlCO0lBQ2hELElBQUksT0FBTyxHQUFHLEVBQUUsQ0FBQTtJQUNoQixNQUFNLE1BQU0sR0FBRyxDQUFDLElBQUksRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQTtJQUMvQyxPQUFPLENBQUMsT0FBTyxJQUFJLE1BQU0sQ0FBQyxJQUFJLENBQUMsUUFBUSxPQUFPLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxNQUFNLFNBQVMsQ0FBQyxDQUFBO0lBQzdFLE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxDQUFDLEVBQUUsRUFBRTtRQUN0RCxNQUFNLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQzdDLE9BQU8sUUFBUSxDQUFDLENBQUMsRUFBRSxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUE7SUFDdkMsQ0FBQyxFQUFFLEVBQUUsV0FBVyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUE7SUFDdEIsT0FBTyxHQUFHLENBQUE7QUFDZCxDQUFDIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3ctcGFjay5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jYWQvc3ctcGFjay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssSUFBSSxNQUFNLE1BQU0sQ0FBQTtBQUM1QixPQUFPLElBQUksTUFBTSxPQUFPLENBQUE7QUFDeEIsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUVwQyxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0seUJBQXlCLENBQUE7QUFDaEQsT0FBTyxFQUFFLElBQUksSUFBSSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQTtBQUNwRCxPQUFPLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUVoRCxNQUFNLENBQUMsS0FBSyxVQUFVLFFBQVEsQ0FBQyxJQUFJLEVBQUUsU0FBOEIsR0FBRyxFQUFFLEdBQUcsQ0FBQyxFQUFFLE9BQXlCO0lBQ25HLElBQUksT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQ2QsT0FBTyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDN0IsQ0FBQztJQUNELE1BQU0sTUFBTSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUM7SUFDM0IsSUFBSSxPQUFPLENBQUMsS0FBSyxJQUFJLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDO1FBQ2xDLE1BQU0sQ0FBQztZQUNILEdBQUcsRUFBRSxJQUFJO1lBQ1QsTUFBTTtTQUNULENBQUMsQ0FBQztRQUNILE9BQU8sT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQzdCLENBQUM7SUFDRCxJQUFJLEdBQUcsR0FBRyxFQUFFLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQztJQUM5QixJQUFJLElBQUksR0FBRztRQUNQLElBQUksSUFBSSxHQUFHO1FBQ1gsSUFBSSxNQUFNLEdBQUc7S0FDaEIsQ0FBQTtJQUdELE1BQU0sR0FBRyxHQUFHLFFBQVEsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDakMsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQyxDQUFDO0lBQzFDLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQztRQUNmLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxHQUFHLHFCQUFxQixHQUFHLEVBQUUsQ0FBQyxDQUFBO1FBQzlDLE1BQU0sQ0FBQyxLQUFLLENBQUMsWUFBWSxHQUFHLE9BQU8sRUFBRSxDQUFDLENBQUE7UUFDdEMsTUFBTSxDQUFDLEtBQUssQ0FBQyxhQUFhLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUFBO1FBQ3hDLE9BQU07SUFDVixDQUFDO0lBRUQsT0FBTyxDQUFDLEtBQUssSUFBSSxNQUFNLENBQUMsS0FBSyxDQUFDLFdBQVcsR0FBRyxJQUFJLEdBQUcsT0FBTyxFQUFFLElBQUksQ0FBQyxDQUFBO0lBQ2pFLE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQ3pELE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUNmLE1BQU0sQ0FBQztZQUNILEdBQUcsQ0FBQztZQUNKLEdBQUcsRUFBRSxJQUFJO1lBQ1QsTUFBTTtTQUNULENBQUMsQ0FBQTtJQUNOLENBQUMsQ0FBQyxDQUFBO0lBQ0YsT0FBTyxPQUFPLENBQUE7QUFDbEIsQ0FBQztBQUVELE1BQU0sQ0FBQyxLQUFLLFVBQVUsSUFBSSxDQUFDLE9BQXlCO0lBQ2hELElBQUksT0FBTyxHQUFHLEVBQUUsQ0FBQTtJQUNoQixNQUFNLE1BQU0sR0FBRyxDQUFDLElBQUksRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQTtJQUMvQyxPQUFPLENBQUMsT0FBTyxJQUFJLE1BQU0sQ0FBQyxJQUFJLENBQUMsUUFBUSxPQUFPLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxNQUFNLFNBQVMsQ0FBQyxDQUFBO0lBQzdFLE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxDQUFDLEVBQUUsRUFBRTtRQUN0RCxNQUFNLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQzdDLE9BQU8sUUFBUSxDQUFDLENBQUMsRUFBRSxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUE7SUFDdkMsQ0FBQyxFQUFFLEVBQUUsV0FBVyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUE7SUFDdEIsT0FBTyxHQUFHLENBQUE7QUFDZCxDQUFDIn0= \ No newline at end of file diff --git a/packages/cad/dist/cad/sw-util.js b/packages/cad/dist/cad/sw-util.js index a0dd537f..a9628772 100644 --- a/packages/cad/dist/cad/sw-util.js +++ b/packages/cad/dist/cad/sw-util.js @@ -4,9 +4,8 @@ import { execSync } from 'child_process'; import { sync as exists } from "@polymech/fs/exists"; import { sync as read } from "@polymech/fs/read"; import { BUF_SIZE_CMP } from '../constants.js'; -import { fileURLToPath } from 'url'; -const __filename = fileURLToPath(import.meta.url); -export const dirname = () => path.dirname(__filename.replace('dist', '')); +//https://nodejs.org/api/esm.html#importmetadirname +export const dirname = () => import.meta.dirname.replace('dist', ''); export const swProcMessage = (log) => { const regex = /<<(\w+)::(.*?)>>/; const match = log.match(regex); @@ -21,7 +20,7 @@ export const fileAsBuffer = (path) => read(path, 'buffer') || Buffer.from("-"); export const getSWBin = (argv) => { const swVersion = parseInt(argv); if (swVersion) { - return path.resolve(dirname + `/../sw/${swVersion}`); + return path.resolve(import.meta.dirname + `/../sw/${swVersion}`); } else { return path.resolve(argv); @@ -84,4 +83,4 @@ export const equalFiles = (pathA, pathB) => { fs.closeSync(fdB); return true; }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3ctdXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jYWQvc3ctdXRpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxNQUFNLElBQUksQ0FBQTtBQUN4QixPQUFPLEtBQUssSUFBSSxNQUFNLE1BQU0sQ0FBQTtBQUM1QixPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBQ3hDLE9BQU8sRUFBRSxJQUFJLElBQUksTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUE7QUFDcEQsT0FBTyxFQUFFLElBQUksSUFBSSxJQUFJLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUNoRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFFOUMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUNwQyxNQUFNLFVBQVUsR0FBRyxhQUFhLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtBQUNqRCxNQUFNLENBQUMsTUFBTSxPQUFPLEdBQUcsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBQyxFQUFFLENBQUMsQ0FBQyxDQUFBO0FBRXhFLE1BQU0sQ0FBQyxNQUFNLGFBQWEsR0FBRyxDQUFDLEdBQVcsRUFBK0MsRUFBRTtJQUN0RixNQUFNLEtBQUssR0FBRyxrQkFBa0IsQ0FBQTtJQUNoQyxNQUFNLEtBQUssR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQzlCLElBQUksS0FBSyxFQUFFLENBQUM7UUFDUixPQUFPO1lBQ0gsUUFBUSxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUM7WUFDbEIsT0FBTyxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUM7U0FDcEIsQ0FBQTtJQUNMLENBQUM7QUFDTCxDQUFDLENBQUE7QUFDRCxNQUFNLENBQUMsTUFBTSxZ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 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3ctdXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jYWQvc3ctdXRpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxNQUFNLElBQUksQ0FBQTtBQUN4QixPQUFPLEtBQUssSUFBSSxNQUFNLE1BQU0sQ0FBQTtBQUM1QixPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBQ3hDLE9BQU8sRUFBRSxJQUFJLElBQUksTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUE7QUFDcEQsT0FBTyxFQUFFLElBQUksSUFBSSxJQUFJLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUNoRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFFOUMsbURBQW1EO0FBQ25ELE1BQU0sQ0FBQyxNQUFNLE9BQU8sR0FBRyxHQUFHLEVBQUUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxDQUFBO0FBRXBFLE1BQU0sQ0FBQyxNQUFNLGFBQWEsR0FBRyxDQUFDLEdBQVcsRUFBK0MsRUFBRTtJQUN0RixNQUFNLEtBQUssR0FBRyxrQkFBa0IsQ0FBQTtJQUNoQyxNQUFNLEtBQUssR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQzlCLElBQUksS0FBSyxFQUFFLENBQUM7UUFDUixPQUFPO1lBQ0gsUUFBUSxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUM7WUFDbEIsT0FBTyxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUM7U0FDcEIsQ0FBQTtJQUNMLENBQUM7QUFDTCxDQUFDLENBQUE7QUFDRCxNQUFNLENBQUMsTUFBTSxZQUFZLEdBQUcsQ0FBQyxJQUFZLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsUUFBUSxDQUFXLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMs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 \ No newline at end of file diff --git a/packages/cad/dist/commands/slice.js b/packages/cad/dist/commands/slice.js index e7fde490..09b18aca 100644 --- a/packages/cad/dist/commands/slice.js +++ b/packages/cad/dist/commands/slice.js @@ -5,7 +5,8 @@ import { convert } from '../print/index.js'; import { load } from 'js-yaml'; import { deepClone as clone } from "@polymech/core/objects"; import { sync as read } from "@polymech/fs/read"; -const SLIC3R_DEFAULTS = () => path.resolve(path.join(__dirname, '../profiles/slic3r_defaults.yaml')); +//import { dirname } from '../util.js' +const SLIC3R_DEFAULTS = () => path.resolve(path.join(import.meta.dirname, '../profiles/slic3r_defaults.yaml')); const defaults = (defaults, options) => { let key, returnObject; returnObject = clone(options) || {}; @@ -49,4 +50,4 @@ export const register = (cli) => { return convert(options); }); }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2xpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29tbWFuZHMvc2xpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLElBQUksTUFBTSxNQUFNLENBQUE7QUFDNUIsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUVwQyxPQUFPLEVBQUUsY0FBYyxFQUFFLFFBQVEsRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBQzVELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUMzQyxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sU0FBUyxDQUFBO0FBQzlCLE9BQU8sRUFBRSxTQUFTLElBQUksS0FBSyxFQUFFLE1BQU0sd0JBQXdCLENBQUE7QUFDM0QsT0FBTyxFQUFFLElBQUksSUFBSSxJQUFJLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUVoRCxNQUFNLGVBQWUsR0FBRyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLGtDQUFrQyxDQUFDLENBQUMsQ0FBQTtBQUVwRyxNQUFNLFFBQVEsR0FBRyxDQUFDLFFBQVEsRUFBRSxPQUFPLEVBQUUsRUFBRTtJQUVuQyxJQUFJLEdBQUcsRUFDSCxZQUFZLENBQUE7SUFFaEIsWUFBWSxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUE7SUFFbkMsS0FBSyxHQUFHLElBQUksUUFBUTtRQUNoQixJQUFJLFFBQVEsQ0FBQyxjQUFjLENBQUMsR0FBRyxDQUFDO1lBQzVCLE9BQU8sWUFBWSxDQUFDLEdBQUcsQ0FBQyxLQUFLLFdBQVc7WUFDeEMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUV6QyxPQUFPLFlBQVksQ0FBQTtBQUN2QixDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxRQUFRLEdBQUcsQ0FBQyxHQUFhLEVBQUUsRUFBRTtJQUV0QyxNQUFNLGFBQWEsR0FBRyxlQUFlLEVBQUUsQ0FBQTtJQUV2QyxHQUFHLENBQUMsbUJBQW1CLENBQUM7UUFDcEIscUJBQXFCLEVBQUUsSUFBSTtRQUMzQixzQkFBc0IsRUFBRSxLQUFLO0tBQ2hDLENBQUMsQ0FBQTtJQUVGLE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxhQUFhLENBQVcsQ0FBQTtJQUNqRCxJQUFJLGFBQWEsR0FBUSxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUE7SUFDMUMsSUFBSSxPQUFPLEdBQVEsQ0FBQyxLQUFlLEVBQUUsRUFBRTtRQUNuQyxJQUFJLElBQUksR0FBRyxjQUFjLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDaEMsTUFBTSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsVUFBVSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7WUFDaEQsTUFBTSxHQUFHLEdBQUcsYUFBYSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQTtZQUN2QyxRQUFRLGFBQWEsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7Z0JBQ3ZDLEtBQUssUUFBUSxDQUFDO2dCQUNkLEtBQUssU0FBUyxDQUFDO2dCQUNmLEtBQUssUUFBUSxDQUFDO2dCQUNkLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztvQkFDWixJQUFJLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsR0FBRyxDQUFDLENBQUE7b0JBQzFCLE1BQU07Z0JBQ1YsQ0FBQztZQUNMLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQTtRQUVGLE9BQU8sSUFBSSxDQUFBO0lBQ2YsQ0FBQyxDQUFBO0lBRUQsT0FBTyxHQUFHLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxZQUFZLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxJQUFtQixFQUFFLEVBQUU7UUFDN0UsSUFBSSxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7WUFBQyxPQUFNO1FBQUMsQ0FBQztRQUV6QixJQUFJLE9BQU8sR0FBRyxRQUFRLENBQUMsSUFBSSxDQUFrQixDQUFBO1FBRTdDLE9BQU8sR0FBRyxRQUFRLENBQUMsYUFBYSxFQUFFLE9BQU8sQ0FBQyxDQUFBO1FBRTFDLE9BQU8sQ0FBQyxLQUFLLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsQ0FBQTtRQUU1RCxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUMzQixDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQSJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2xpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29tbWFuZHMvc2xpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLElBQUksTUFBTSxNQUFNLENBQUE7QUFDNUIsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUVwQyxPQUFPLEVBQUUsY0FBYyxFQUFFLFFBQVEsRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBQzVELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUMzQyxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sU0FBUyxDQUFBO0FBQzlCLE9BQU8sRUFBRSxTQUFTLElBQUksS0FBSyxFQUFFLE1BQU0sd0JBQXdCLENBQUE7QUFDM0QsT0FBTyxFQUFFLElBQUksSUFBSSxJQUFJLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUNoRCxzQ0FBc0M7QUFDdEMsTUFBTSxlQUFlLEdBQUcsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLGtDQUFrQyxDQUFDLENBQUMsQ0FBQTtBQUU5RyxNQUFNLFFBQVEsR0FBRyxDQUFDLFFBQVEsRUFBRSxPQUFPLEVBQUUsRUFBRTtJQUVuQyxJQUFJLEdBQUcsRUFDSCxZQUFZLENBQUE7SUFFaEIsWUFBWSxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUE7SUFFbkMsS0FBSyxHQUFHLElBQUksUUFBUTtRQUNoQixJQUFJLFFBQVEsQ0FBQyxjQUFjLENBQUMsR0FBRyxDQUFDO1lBQzVCLE9BQU8sWUFBWSxDQUFDLEdBQUcsQ0FBQyxLQUFLLFdBQVc7WUFDeEMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUV6QyxPQUFPLFlBQVksQ0FBQTtBQUN2QixDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxRQUFRLEdBQUcsQ0FBQyxHQUFhLEVBQUUsRUFBRTtJQUV0QyxNQUFNLGFBQWEsR0FBRyxlQUFlLEVBQUUsQ0FBQTtJQUV2QyxHQUFHLENBQUMsbUJBQW1CLENBQUM7UUFDcEIscUJBQXFCLEVBQUUsSUFBSTtRQUMzQixzQkFBc0IsRUFBRSxLQUFLO0tBQ2hDLENBQUMsQ0FBQTtJQUVGLE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxhQUFhLENBQVcsQ0FBQTtJQUNqRCxJQUFJLGFBQWEsR0FBUSxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUE7SUFDMUMsSUFBSSxPQUFPLEdBQVEsQ0FBQyxLQUFlLEVBQUUsRUFBRTtRQUNuQyxJQUFJLElBQUksR0FBRyxjQUFjLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDaEMsTUFBTSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsVUFBVSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7WUFDaEQsTUFBTSxHQUFHLEdBQUcsYUFBYSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQTtZQUN2QyxRQUFRLGFBQWEsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7Z0JBQ3ZDLEtBQUssUUFBUSxDQUFDO2dCQUNkLEtBQUssU0FBUyxDQUFDO2dCQUNmLEtBQUssUUFBUSxDQUFDO2dCQUNkLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztvQkFDWixJQUFJLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsR0FBRyxDQUFDLENBQUE7b0JBQzFCLE1BQU07Z0JBQ1YsQ0FBQztZQUNMLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQTtRQUVGLE9BQU8sSUFBSSxDQUFBO0lBQ2YsQ0FBQyxDQUFBO0lBRUQsT0FBTyxHQUFHLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxZQUFZLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxJQUFtQixFQUFFLEVBQUU7UUFDN0UsSUFBSSxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7WUFBQyxPQUFNO1FBQUMsQ0FBQztRQUV6QixJQUFJLE9BQU8sR0FBRyxRQUFRLENBQUMsSUFBSSxDQUFrQixDQUFBO1FBRTdDLE9BQU8sR0FBRyxRQUFRLENBQUMsYUFBYSxFQUFFLE9BQU8sQ0FBQyxDQUFBO1FBRTFDLE9BQU8sQ0FBQyxLQUFLLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsQ0FBQTtRQUU1RCxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUMzQixDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQSJ9 \ No newline at end of file diff --git a/packages/cad/src/cad/sw-convert.ts b/packages/cad/src/cad/sw-convert.ts index 480e5acc..1c2b7618 100644 --- a/packages/cad/src/cad/sw-convert.ts +++ b/packages/cad/src/cad/sw-convert.ts @@ -3,7 +3,7 @@ import pMap from 'p-map' import pkg from 'which'; const { sync: which } = pkg; import { resolve, OSR_CACHE } from '@polymech/commons' -import { dirname, equalFiles, swProcMessage } from './sw-util.js' +import { equalFiles, swProcMessage } from './sw-util.js' import { reportCSV } from '../report/csv.js' import { logger, substitute } from '../index.js' import { removeEmpty } from '../lib/index.js' @@ -210,7 +210,7 @@ export const convertFile = async ( const bin = path.resolve(`${cwd}/${exe}`) if (!exists(bin)) { logger.error(`${bin} doesnt exists in ${cwd}`) - logger.error('__dirname:' + dirname()) + logger.error('dirname:' + import.meta.dirname) logger.error('options.sw ' + options.sw) return } diff --git a/packages/cad/src/cad/sw-pack.ts b/packages/cad/src/cad/sw-pack.ts index 00d612f6..2d0f1774 100644 --- a/packages/cad/src/cad/sw-pack.ts +++ b/packages/cad/src/cad/sw-pack.ts @@ -4,7 +4,7 @@ import { logger } from '../index.js' import { SolidworkOptions } from '../types.js' import { Helper } from '../lib/process/index.js' import { sync as exists } from "@polymech/fs/exists" -import { getSWBin } from './sw-util.js' +import { dirname, getSWBin } from './sw-util.js' export async function packFile(file, onNode: (data: any) => void = () => { }, options: SolidworkOptions) { if (options.dry) { @@ -29,7 +29,7 @@ export async function packFile(file, onNode: (data: any) => void = () => { }, op const bin = path.resolve(`${cwd}/${exe}`); if (!exists(bin)) { logger.error(`${bin} doesnt exists in ${cwd}`) - logger.error('__dirname:' + __dirname) + logger.error('__dirname:' + dirname()) logger.error('options.sw ' + options.sw) return } diff --git a/packages/cad/src/cad/sw-util.ts b/packages/cad/src/cad/sw-util.ts index dc436d89..20f19e73 100644 --- a/packages/cad/src/cad/sw-util.ts +++ b/packages/cad/src/cad/sw-util.ts @@ -5,9 +5,8 @@ import { sync as exists } from "@polymech/fs/exists" import { sync as read } from "@polymech/fs/read" import { BUF_SIZE_CMP } from '../constants.js' -import { fileURLToPath } from 'url'; -const __filename = fileURLToPath(import.meta.url) -export const dirname = () => path.dirname(__filename.replace('dist','')) +//https://nodejs.org/api/esm.html#importmetadirname +export const dirname = () => import.meta.dirname.replace('dist', '') export const swProcMessage = (log: string):{ logLevel: string, message: string } | null => { const regex = /<<(\w+)::(.*?)>>/ @@ -24,7 +23,7 @@ export const fileAsBuffer = (path: string) => read(path, 'buffer') as Buffer || export const getSWBin = (argv: string) => { const swVersion = parseInt(argv) if (swVersion) { - return path.resolve(dirname + `/../sw/${swVersion}`) + return path.resolve(import.meta.dirname + `/../sw/${swVersion}`) } else { return path.resolve(argv) } diff --git a/packages/cad/src/commands/slice.ts b/packages/cad/src/commands/slice.ts index 9cbd18bd..1aa0f250 100644 --- a/packages/cad/src/commands/slice.ts +++ b/packages/cad/src/commands/slice.ts @@ -7,8 +7,8 @@ import { convert } from '../print/index.js' import { load } from 'js-yaml' import { deepClone as clone } from "@polymech/core/objects" import { sync as read } from "@polymech/fs/read" - -const SLIC3R_DEFAULTS = () => path.resolve(path.join(__dirname, '../profiles/slic3r_defaults.yaml')) +//import { dirname } from '../util.js' +const SLIC3R_DEFAULTS = () => path.resolve(path.join(import.meta.dirname, '../profiles/slic3r_defaults.yaml')) const defaults = (defaults, options) => { diff --git a/packages/commons/dist/component.d.ts b/packages/commons/dist/component.d.ts index d53ed612..fd68d069 100644 --- a/packages/commons/dist/component.d.ts +++ b/packages/commons/dist/component.d.ts @@ -32,10 +32,10 @@ export declare const ImageMetaSchema: z.ZodObject<{ orientation: z.ZodNumber; exif: z.ZodAny; }, "strip", z.ZodTypeAny, { + height?: number; + width?: number; exif?: any; format?: string; - width?: number; - height?: number; space?: string; channels?: number; depth?: string; @@ -47,10 +47,10 @@ export declare const ImageMetaSchema: z.ZodObject<{ hasAlpha?: boolean; orientation?: number; }, { + height?: number; + width?: number; exif?: any; format?: string; - width?: number; - height?: number; space?: string; channels?: number; depth?: string; @@ -70,15 +70,15 @@ export declare const CADMetaSchema: z.ZodObject<{ model: z.ZodOptional; html: z.ZodOptional; }, "strip", z.ZodTypeAny, { - file?: string; name?: string; + file?: string; configuration?: string; step?: string; model?: string; html?: string; }, { - file?: string; name?: string; + file?: string; configuration?: string; step?: string; model?: string; @@ -127,14 +127,6 @@ export declare const AssetImageSchema: z.ZodObject<{ gps?: any; }>>; }, "strip", z.ZodTypeAny, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -144,16 +136,16 @@ export declare const AssetImageSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -163,7 +155,15 @@ export declare const AssetImageSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }>; export declare const AuthorSchema: z.ZodObject<{ name: z.ZodString; @@ -244,14 +244,6 @@ export declare const AssetsSchema: z.ZodObject<{ gps?: any; }>>; }, "strip", z.ZodTypeAny, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -261,16 +253,16 @@ export declare const AssetsSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -280,7 +272,15 @@ export declare const AssetsSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }>, "many">>; renderings: z.ZodOptional; @@ -312,14 +312,6 @@ export declare const AssetsSchema: z.ZodObject<{ gps?: any; }>>; }, "strip", z.ZodTypeAny, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -329,16 +321,16 @@ export declare const AssetsSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -348,7 +340,15 @@ export declare const AssetsSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }>, "many">>; components: z.ZodOptional; @@ -380,14 +380,6 @@ export declare const AssetsSchema: z.ZodObject<{ gps?: any; }>>; }, "strip", z.ZodTypeAny, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -397,16 +389,16 @@ export declare const AssetsSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -416,18 +408,18 @@ export declare const AssetsSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }>, "many">>; }, "strip", z.ZodTypeAny, { gallery?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -437,17 +429,17 @@ export declare const AssetsSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; renderings?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -457,17 +449,17 @@ export declare const AssetsSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; components?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -477,18 +469,18 @@ export declare const AssetsSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; }, { gallery?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -498,17 +490,17 @@ export declare const AssetsSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; renderings?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -518,17 +510,17 @@ export declare const AssetsSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; components?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -538,7 +530,15 @@ export declare const AssetsSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; }>; export declare const ProductionSchema: z.ZodObject<{ @@ -633,14 +633,6 @@ export declare const ComponentConfigSchema: z.ZodObject<{ gps?: any; }>>; }, "strip", z.ZodTypeAny, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -650,16 +642,16 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -669,7 +661,15 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }>>; name: z.ZodString; flags: z.ZodOptional; @@ -682,15 +682,15 @@ export declare const ComponentConfigSchema: z.ZodObject<{ model: z.ZodOptional; html: z.ZodOptional; }, "strip", z.ZodTypeAny, { - file?: string; name?: string; + file?: string; configuration?: string; step?: string; model?: string; html?: string; }, { - file?: string; name?: string; + file?: string; configuration?: string; step?: string; model?: string; @@ -763,14 +763,6 @@ export declare const ComponentConfigSchema: z.ZodObject<{ gps?: any; }>>; }, "strip", z.ZodTypeAny, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -780,16 +772,16 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -799,7 +791,15 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }>, "many">>; renderings: z.ZodOptional; @@ -831,14 +831,6 @@ export declare const ComponentConfigSchema: z.ZodObject<{ gps?: any; }>>; }, "strip", z.ZodTypeAny, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -848,16 +840,16 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -867,7 +859,15 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }>, "many">>; components: z.ZodOptional; @@ -899,14 +899,6 @@ export declare const ComponentConfigSchema: z.ZodObject<{ gps?: any; }>>; }, "strip", z.ZodTypeAny, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -916,16 +908,16 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -935,18 +927,18 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }>, "many">>; }, "strip", z.ZodTypeAny, { gallery?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -956,17 +948,17 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; renderings?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -976,17 +968,17 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; components?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -996,18 +988,18 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; }, { gallery?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1017,17 +1009,17 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; renderings?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1037,17 +1029,17 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; components?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1057,7 +1049,15 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; }>>; resources: z.ZodDefault>; }, "strip", z.ZodTypeAny, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1206,16 +1198,16 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1225,7 +1217,15 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }>>; name: z.ZodString; flags: z.ZodOptional; @@ -1238,15 +1238,15 @@ export declare const ComponentConfigSchema: z.ZodObject<{ model: z.ZodOptional; html: z.ZodOptional; }, "strip", z.ZodTypeAny, { - file?: string; name?: string; + file?: string; configuration?: string; step?: string; model?: string; html?: string; }, { - file?: string; name?: string; + file?: string; configuration?: string; step?: string; model?: string; @@ -1319,14 +1319,6 @@ export declare const ComponentConfigSchema: z.ZodObject<{ gps?: any; }>>; }, "strip", z.ZodTypeAny, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1336,16 +1328,16 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1355,7 +1347,15 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }>, "many">>; renderings: z.ZodOptional; @@ -1387,14 +1387,6 @@ export declare const ComponentConfigSchema: z.ZodObject<{ gps?: any; }>>; }, "strip", z.ZodTypeAny, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1404,16 +1396,16 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1423,7 +1415,15 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }>, "many">>; components: z.ZodOptional; @@ -1455,14 +1455,6 @@ export declare const ComponentConfigSchema: z.ZodObject<{ gps?: any; }>>; }, "strip", z.ZodTypeAny, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1472,16 +1464,16 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1491,18 +1483,18 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }>, "many">>; }, "strip", z.ZodTypeAny, { gallery?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1512,17 +1504,17 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; renderings?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1532,17 +1524,17 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; components?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1552,18 +1544,18 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; }, { gallery?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1573,17 +1565,17 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; renderings?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1593,17 +1585,17 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; components?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1613,7 +1605,15 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; }>>; resources: z.ZodDefault>; }, "strip", z.ZodTypeAny, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1762,16 +1754,16 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1781,7 +1773,15 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }>>; name: z.ZodString; flags: z.ZodOptional; @@ -1794,15 +1794,15 @@ export declare const ComponentConfigSchema: z.ZodObject<{ model: z.ZodOptional; html: z.ZodOptional; }, "strip", z.ZodTypeAny, { - file?: string; name?: string; + file?: string; configuration?: string; step?: string; model?: string; html?: string; }, { - file?: string; name?: string; + file?: string; configuration?: string; step?: string; model?: string; @@ -1875,14 +1875,6 @@ export declare const ComponentConfigSchema: z.ZodObject<{ gps?: any; }>>; }, "strip", z.ZodTypeAny, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1892,16 +1884,16 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1911,7 +1903,15 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }>, "many">>; renderings: z.ZodOptional; @@ -1943,14 +1943,6 @@ export declare const ComponentConfigSchema: z.ZodObject<{ gps?: any; }>>; }, "strip", z.ZodTypeAny, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1960,16 +1952,16 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -1979,7 +1971,15 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }>, "many">>; components: z.ZodOptional; @@ -2011,14 +2011,6 @@ export declare const ComponentConfigSchema: z.ZodObject<{ gps?: any; }>>; }, "strip", z.ZodTypeAny, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -2028,16 +2020,16 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }, { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -2047,18 +2039,18 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }>, "many">>; }, "strip", z.ZodTypeAny, { gallery?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -2068,17 +2060,17 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; renderings?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -2088,17 +2080,17 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; components?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -2108,18 +2100,18 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; }, { gallery?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -2129,17 +2121,17 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; renderings?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -2149,17 +2141,17 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; components?: { - exif?: { - file?: any; - jfif?: any; - exif?: any; - gps?: any; - }; - width?: number; - height?: number; name?: string; url?: string; thumb?: string; @@ -2169,7 +2161,15 @@ export declare const ComponentConfigSchema: z.ZodObject<{ description?: string; alt?: string; title?: string; + height?: number; + width?: number; order?: number; + exif?: { + file?: any; + jfif?: any; + exif?: any; + gps?: any; + }; }[]; }>>; resources: z.ZodDefault + * + * Copyright (c) 2015, Jon Schlinkert. + * Licensed under the MIT License. + */ +/** + * The structure returned by parseGlob. + */ +export interface ParsedGlob { + orig: string; + is: { + glob: boolean; + negated: boolean; + extglob: boolean; + braces: boolean; + brackets: boolean; + globstar: boolean; + dotfile: boolean; + dotdir: boolean; + }; + glob: string; + base: string; + path: { + dirname: string; + basename: string; + filename: string; + extname: string; + ext: string; + }; +} +/** + * Expose `cache` + */ +export declare const cache: Record; +/** + * Parse a glob pattern into tokens. + * + * When no paths or '**' are in the glob, a different + * strategy is used for parsing the filename, since + * file names can contain braces and other tricky patterns: + * + * - `*.{a,b}` + * - `(**|*.js)` + */ +export declare function parseGlob(glob: string): ParsedGlob; diff --git a/packages/commons/dist/fs/glob-parse.js b/packages/commons/dist/fs/glob-parse.js new file mode 100644 index 00000000..203c81a6 --- /dev/null +++ b/packages/commons/dist/fs/glob-parse.js @@ -0,0 +1,143 @@ +/*! + * parse-glob + * + * Copyright (c) 2015, Jon Schlinkert. + * Licensed under the MIT License. + */ +import { hasMagic } from 'glob'; +import { globBase } from './glob-base.js'; +/** + * Expose `cache` + */ +export const cache = {}; +/** + * Parse a glob pattern into tokens. + * + * When no paths or '**' are in the glob, a different + * strategy is used for parsing the filename, since + * file names can contain braces and other tricky patterns: + * + * - `*.{a,b}` + * - `(**|*.js)` + */ +export function parseGlob(glob) { + if (cache.hasOwnProperty(glob)) { + return cache[glob]; + } + const tok = {}; + tok.orig = glob; + tok.is = { + glob: false, + negated: false, + extglob: false, + braces: false, + brackets: false, + globstar: false, + dotfile: false, + dotdir: false, + }; + // Temporarily escape dots and slashes within braces/brackets + glob = escapeSpecial(glob); + const parsed = globBase(glob); + tok.is.glob = parsed.isGlob; + tok.glob = parsed.glob; + tok.base = parsed.base; + const segs = /([^/]*)$/.exec(glob); + tok.path = { + dirname: '', + basename: segs ? segs[1] : '', + filename: '', + extname: '', + ext: '', + }; + tok.path.dirname = glob.split(tok.path.basename).join('') || ''; + const basenameParts = tok.path.basename.split('.') || []; + tok.path.filename = basenameParts[0] || ''; + tok.path.extname = basenameParts.slice(1).join('.') || ''; + // If the dirname is a glob and we have no basename, adjust + if (hasMagic(tok.path.dirname) && !tok.path.basename) { + if (!/\/$/.test(tok.glob)) { + tok.path.basename = tok.glob; + } + tok.path.dirname = tok.base; + } + // If glob doesn't contain '/', handle everything as basename + if (!glob.includes('/') && !tok.is.globstar) { + tok.path.dirname = ''; + tok.path.basename = tok.orig; + } + const dotIndex = tok.path.basename.indexOf('.'); + if (dotIndex !== -1) { + tok.path.filename = tok.path.basename.slice(0, dotIndex); + tok.path.extname = tok.path.basename.slice(dotIndex); + } + if (tok.path.extname.startsWith('.')) { + const exts = tok.path.extname.split('.'); + tok.path.ext = exts[exts.length - 1]; + } + // Unescape + tok.glob = unescapeSpecial(tok.glob); + tok.path.dirname = unescapeSpecial(tok.path.dirname); + tok.path.basename = unescapeSpecial(tok.path.basename); + tok.path.filename = unescapeSpecial(tok.path.filename); + tok.path.extname = unescapeSpecial(tok.path.extname); + // Booleans + const maybeGlob = !!glob && tok.is.glob; + tok.is.negated = !!glob && glob.charAt(0) === '!'; + //tok.is.extglob = !!glob && extglob(glob); + tok.is.braces = has(maybeGlob, glob, '{'); + tok.is.brackets = has(maybeGlob, glob, '[:'); + tok.is.globstar = has(maybeGlob, glob, '**'); + //tok.is.dotfile = dotfile(tok.path.basename) || dotfile(tok.path.filename); + tok.is.dotdir = isDotDir(tok.path.dirname); + cache[glob] = tok; + return tok; +} +/** + * Returns true if the pattern has the given `ch`aracter(s). + */ +function has(is, glob, ch) { + return is && glob.includes(ch); +} +/** + * Returns true if the glob matches dot-directories. + */ +function isDotDir(base) { + if (base.includes('/.')) { + return true; + } + if (base.charAt(0) === '.' && base.charAt(1) !== '/') { + return true; + } + return false; +} +/** + * Escape special characters (dots and slashes) in braces/brackets/parens. + */ +function escapeSpecial(str) { + const re = /\{([^{}]*?)\}|\(([^()]*?)\)|\[([^\[\]]*?)\]/g; + return str.replace(re, (outer, braces, parens, brackets) => { + const inner = braces || parens || brackets; + if (!inner) + return outer; + return outer.split(inner).join(escapeDotsAndSlashes(inner)); + }); +} +function escapeDotsAndSlashes(str) { + return str + .split('/') + .join('__SLASH__') + .split('.') + .join('__DOT__'); +} +/** + * Unescape special placeholders back to dots and slashes. + */ +function unescapeSpecial(str) { + return str + .split('__SLASH__') + .join('/') + .split('__DOT__') + .join('.'); +} +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2xvYi1wYXJzZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mcy9nbG9iLXBhcnNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7OztHQUtHO0FBRUgsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLE1BQU0sQ0FBQTtBQUMvQixPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUE4QjFDOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sS0FBSyxHQUErQixFQUFFLENBQUM7QUFFcEQ7Ozs7Ozs7OztHQVNHO0FBQ0gsTUFBTSxVQUFVLFNBQVMsQ0FBQyxJQUFZO0lBQ3BDLElBQUksS0FBSyxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO1FBQy9CLE9BQU8sS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3JCLENBQUM7SUFFRCxNQUFNLEdBQUcsR0FBRyxFQUFnQixDQUFDO0lBQzdCLEdBQUcsQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO0lBQ2hCLEdBQUcsQ0FBQyxFQUFFLEdBQUc7UUFDUCxJQUFJLEVBQUUsS0FBSztRQUNYLE9BQU8sRUFBRSxLQUFLO1FBQ2QsT0FBTyxFQUFFLEtBQUs7UUFDZCxNQUFNLEVBQUUsS0FBSztRQUNiLFFBQVEsRUFBRSxLQUFLO1FBQ2YsUUFBUSxFQUFFLEtBQUs7UUFDZixPQUFPLEVBQUUsS0FBSztRQUNkLE1BQU0sRUFBRSxLQUFLO0tBQ2QsQ0FBQztJQUVGLDZEQUE2RDtJQUM3RCxJQUFJLEdBQUcsYUFBYSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRTNCLE1BQU0sTUFBTSxHQUFHLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUM3QixHQUFHLENBQUMsRUFBRSxDQUFDLElBQUksR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDO0lBQzVCLEdBQUcsQ0FBQyxJQUFJLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQztJQUN2QixHQUFHLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUM7SUFFdkIsTUFBTSxJQUFJLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNuQyxHQUFHLENBQUMsSUFBSSxHQUFHO1FBQ1QsT0FBTyxFQUFFLEVBQUU7UUFDWCxRQUFRLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUU7UUFDN0IsUUFBUSxFQUFFLEVBQUU7UUFDWixPQUFPLEVBQUUsRUFBRTtRQUNYLEdBQUcsRUFBRSxFQUFFO0tBQ1IsQ0FBQztJQUVGLEdBQUcsQ0FBQyxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQ2hFLE1BQU0sYUFBYSxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDekQsR0FBRyxDQUFDLElBQUksQ0FBQyxRQUFRLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUMzQyxHQUFHLENBQUMsSUFBSSxDQUFDLE9BQU8sR0FBRyxhQUFhLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUM7SUFFMUQsMkRBQTJEO0lBQzNELElBQUksUUFBUSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ3JELElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO1lBQzFCLEdBQUcsQ0FBQyxJQUFJLENBQUMsUUFBUSxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUM7UUFDL0IsQ0FBQztRQUNELEdBQUcsQ0FBQyxJQUFJLENBQUMsT0FBTyxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUM7SUFDOUIsQ0FBQztJQUVELDZEQUE2RDtJQUM3RCxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDNUMsR0FBRyxDQUFDLElBQUksQ0FBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO1FBQ3RCLEdBQUcsQ0FBQyxJQUFJLENBQUMsUUFBUSxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUM7SUFDL0IsQ0FBQztJQUVELE1BQU0sUUFBUSxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNoRCxJQUFJLFFBQVEsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDO1FBQ3BCLEdBQUcsQ0FBQyxJQUFJLENBQUMsUUFBUSxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDekQsR0FBRyxDQUFDLElBQUksQ0FBQyxPQUFPLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ3ZELENBQUM7SUFFRCxJQUFJLEdBQUcsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQ3JDLE1BQU0sSUFBSSxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN6QyxHQUFHLENBQUMsSUFBSSxDQUFDLEdBQUcsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsQ0FBQztJQUN2QyxDQUFDO0lBRUQsV0FBVztJQUNYLEdBQUcsQ0FBQyxJQUFJLEdBQUcsZUFBZSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNyQyxHQUFHLENBQUMsSUFBSSxDQUFDLE9BQU8sR0FBRyxlQUFlLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNyRCxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsR0FBRyxlQUFlLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUN2RCxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsR0FBRyxlQUFlLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUN2RCxHQUFHLENBQUMsSUFBSSxDQUFDLE9BQU8sR0FBRyxlQUFlLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUVyRCxXQUFXO0lBQ1gsTUFBTSxTQUFTLEdBQUcsQ0FBQyxDQUFDLElBQUksSUFBSSxHQUFHLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQztJQUN4QyxHQUFHLENBQUMsRUFBRSxDQUFDLE9BQU8sR0FBRyxDQUFDLENBQUMsSUFBSSxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxDQUFDO0lBQ2xELDJDQUEyQztJQUMzQyxHQUFHLENBQUMsRUFBRSxDQUFDLE1BQU0sR0FBRyxHQUFHLENBQUMsU0FBUyxFQUFFLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQztJQUMxQyxHQUFHLENBQUMsRUFBRSxDQUFDLFFBQVEsR0FBRyxHQUFHLENBQUMsU0FBUyxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztJQUM3QyxHQUFHLENBQUMsRUFBRSxDQUFDLFFBQVEsR0FBRyxHQUFHLENBQUMsU0FBUyxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztJQUM3Qyw0RUFBNEU7SUFDNUUsR0FBRyxDQUFDLEVBQUUsQ0FBQyxNQUFNLEdBQUcsUUFBUSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFM0MsS0FBSyxDQUFDLElBQUksQ0FBQyxHQUFHLEdBQUcsQ0FBQztJQUNsQixPQUFPLEdBQUcsQ0FBQztBQUNiLENBQUM7QUFFRDs7R0FFRztBQUNILFNBQVMsR0FBRyxDQUFDLEVBQVcsRUFBRSxJQUFZLEVBQUUsRUFBVTtJQUNoRCxPQUFPLEVBQUUsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0FBQ2pDLENBQUM7QUFFRDs7R0FFRztBQUNILFNBQVMsUUFBUSxDQUFDLElBQVk7SUFDNUIsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7UUFDeEIsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBQ0QsSUFBSSxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsSUFBSSxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsRUFBRSxDQUFDO1FBQ3JELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUNELE9BQU8sS0FBSyxDQUFDO0FBQ2YsQ0FBQztBQUVEOztHQUVHO0FBQ0gsU0FBUyxhQUFhLENBQUMsR0FBVztJQUNoQyxNQUFNLEVBQUUsR0FBRyw4Q0FBOEMsQ0FBQztJQUMxRCxPQUFPLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFBRSxFQUFFLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLEVBQUU7UUFDekQsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLE1BQU0sSUFBSSxRQUFRLENBQUM7UUFDM0MsSUFBSSxDQUFDLEtBQUs7WUFBRSxPQUFPLEtBQUssQ0FBQztRQUN6QixPQUFPLEtBQUssQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsSUFBSSxDQUFDLG9CQUFvQixDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7SUFDOUQsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBRUQsU0FBUyxvQkFBb0IsQ0FBQyxHQUFXO0lBQ3ZDLE9BQU8sR0FBRztTQUNQLEtBQUssQ0FBQyxHQUFHLENBQUM7U0FDVixJQUFJLENBQUMsV0FBVyxDQUFDO1NBQ2pCLEtBQUssQ0FBQyxHQUFHLENBQUM7U0FDVixJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7QUFDckIsQ0FBQztBQUVEOztHQUVHO0FBQ0gsU0FBUyxlQUFlLENBQUMsR0FBVztJQUNsQyxPQUFPLEdBQUc7U0FDUCxLQUFLLENBQUMsV0FBVyxDQUFDO1NBQ2xCLElBQUksQ0FBQyxHQUFHLENBQUM7U0FDVCxLQUFLLENBQUMsU0FBUyxDQUFDO1NBQ2hCLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNmLENBQUMifQ== \ No newline at end of file diff --git a/packages/commons/src/fs/glob-parse.ts b/packages/commons/src/fs/glob-parse.ts new file mode 100644 index 00000000..3ad7e88f --- /dev/null +++ b/packages/commons/src/fs/glob-parse.ts @@ -0,0 +1,189 @@ +/*! + * parse-glob + * + * Copyright (c) 2015, Jon Schlinkert. + * Licensed under the MIT License. + */ + +import { hasMagic } from 'glob' +import { globBase } from './glob-base.js'; +//import extglob from 'is-extglob'; +//import dotfile from 'is-dotfile'; + +/** + * The structure returned by parseGlob. + */ +export interface ParsedGlob { + orig: string; + is: { + glob: boolean; + negated: boolean; + extglob: boolean; + braces: boolean; + brackets: boolean; + globstar: boolean; + dotfile: boolean; + dotdir: boolean; + }; + glob: string; + base: string; + path: { + dirname: string; + basename: string; + filename: string; + extname: string; + ext: string; + }; +} + +/** + * Expose `cache` + */ +export const cache: Record = {}; + +/** + * Parse a glob pattern into tokens. + * + * When no paths or '**' are in the glob, a different + * strategy is used for parsing the filename, since + * file names can contain braces and other tricky patterns: + * + * - `*.{a,b}` + * - `(**|*.js)` + */ +export function parseGlob(glob: string): ParsedGlob { + if (cache.hasOwnProperty(glob)) { + return cache[glob]; + } + + const tok = {} as ParsedGlob; + tok.orig = glob; + tok.is = { + glob: false, + negated: false, + extglob: false, + braces: false, + brackets: false, + globstar: false, + dotfile: false, + dotdir: false, + }; + + // Temporarily escape dots and slashes within braces/brackets + glob = escapeSpecial(glob); + + const parsed = globBase(glob) + tok.is.glob = parsed.isGlob; + tok.glob = parsed.glob; + tok.base = parsed.base; + + const segs = /([^/]*)$/.exec(glob); + tok.path = { + dirname: '', + basename: segs ? segs[1] : '', + filename: '', + extname: '', + ext: '', + }; + + tok.path.dirname = glob.split(tok.path.basename).join('') || ''; + const basenameParts = tok.path.basename.split('.') || []; + tok.path.filename = basenameParts[0] || ''; + tok.path.extname = basenameParts.slice(1).join('.') || ''; + + // If the dirname is a glob and we have no basename, adjust + if (hasMagic(tok.path.dirname) && !tok.path.basename) { + if (!/\/$/.test(tok.glob)) { + tok.path.basename = tok.glob; + } + tok.path.dirname = tok.base; + } + + // If glob doesn't contain '/', handle everything as basename + if (!glob.includes('/') && !tok.is.globstar) { + tok.path.dirname = ''; + tok.path.basename = tok.orig; + } + + const dotIndex = tok.path.basename.indexOf('.'); + if (dotIndex !== -1) { + tok.path.filename = tok.path.basename.slice(0, dotIndex); + tok.path.extname = tok.path.basename.slice(dotIndex); + } + + if (tok.path.extname.startsWith('.')) { + const exts = tok.path.extname.split('.'); + tok.path.ext = exts[exts.length - 1]; + } + + // Unescape + tok.glob = unescapeSpecial(tok.glob); + tok.path.dirname = unescapeSpecial(tok.path.dirname); + tok.path.basename = unescapeSpecial(tok.path.basename); + tok.path.filename = unescapeSpecial(tok.path.filename); + tok.path.extname = unescapeSpecial(tok.path.extname); + + // Booleans + const maybeGlob = !!glob && tok.is.glob; + tok.is.negated = !!glob && glob.charAt(0) === '!'; + //tok.is.extglob = !!glob && extglob(glob); + tok.is.braces = has(maybeGlob, glob, '{'); + tok.is.brackets = has(maybeGlob, glob, '[:'); + tok.is.globstar = has(maybeGlob, glob, '**'); + //tok.is.dotfile = dotfile(tok.path.basename) || dotfile(tok.path.filename); + tok.is.dotdir = isDotDir(tok.path.dirname); + + cache[glob] = tok; + return tok; +} + +/** + * Returns true if the pattern has the given `ch`aracter(s). + */ +function has(is: boolean, glob: string, ch: string): boolean { + return is && glob.includes(ch); +} + +/** + * Returns true if the glob matches dot-directories. + */ +function isDotDir(base: string): boolean { + if (base.includes('/.')) { + return true; + } + if (base.charAt(0) === '.' && base.charAt(1) !== '/') { + return true; + } + return false; +} + +/** + * Escape special characters (dots and slashes) in braces/brackets/parens. + */ +function escapeSpecial(str: string): string { + const re = /\{([^{}]*?)\}|\(([^()]*?)\)|\[([^\[\]]*?)\]/g; + return str.replace(re, (outer, braces, parens, brackets) => { + const inner = braces || parens || brackets; + if (!inner) return outer; + return outer.split(inner).join(escapeDotsAndSlashes(inner)); + }); +} + +function escapeDotsAndSlashes(str: string): string { + return str + .split('/') + .join('__SLASH__') + .split('.') + .join('__DOT__'); +} + +/** + * Unescape special placeholders back to dots and slashes. + */ +function unescapeSpecial(str: string): string { + return str + .split('__SLASH__') + .join('/') + .split('__DOT__') + .join('.'); +} diff --git a/packages/core/dist/pick.d.ts b/packages/core/dist/pick.d.ts new file mode 100644 index 00000000..22dba279 --- /dev/null +++ b/packages/core/dist/pick.d.ts @@ -0,0 +1,25 @@ +import { Split } from 'type-fest'; +/** + * Recursively pick the sub-object from T according to the array of keys in Keys. + * + * If Keys = ['address', 'coords', 'lat'], + * we want to produce { address: { coords: { lat: number } } } at the type level. + */ +type DeepPickArray = Keys extends [] ? T : Keys extends [infer Head, ...infer Tail] ? Head extends keyof T ? { + [P in Head]: Tail extends string[] ? DeepPickArray : never; +} : never : never; +/** + * Given a single path string (e.g. "address/coords/lat") and a separator (default = "."), + * parse that path into an array via `Split`, then recursively pick the resulting type. + */ +type DeepPickOne = DeepPickArray>; +/** + * If DeepPickOne yields `never` (meaning invalid path), + * we allow a fallback type D (default = undefined). + */ +type DeepPickValue = DeepPickOne extends infer R ? [R] extends [never] ? D : R : D; +export declare function pick(obj: T, path: Path, options?: { + separator?: Sep; + defaultValue?: D; +}): DeepPickValue; +export {}; diff --git a/packages/core/dist/pick.js b/packages/core/dist/pick.js new file mode 100644 index 00000000..d983f1b0 --- /dev/null +++ b/packages/core/dist/pick.js @@ -0,0 +1,19 @@ +export function pick(obj, path, options) { + // Determine separator (default to "/") + const separator = options?.separator ?? "/"; + // Split the path into keys + const keys = path.split(separator); + // Traverse the object + let current = obj; + for (const key of keys) { + if (current == null || !(key in current)) { + // If we can't go further, return defaultValue (if provided) + return options?.defaultValue + ?? undefined; + } + current = current[key]; + } + // If we successfully traversed the entire path, return the value + return current; +} +//# sourceMappingURL=pick.js.map \ No newline at end of file diff --git a/packages/core/dist/pick.js.map b/packages/core/dist/pick.js.map new file mode 100644 index 00000000..d0927b35 --- /dev/null +++ b/packages/core/dist/pick.js.map @@ -0,0 +1 @@ +{"version":3,"file":"pick.js","sourceRoot":"","sources":["../src/pick.ts"],"names":[],"mappings":"AA8CA,MAAM,UAAU,IAAI,CAMhB,GAAM,EACN,IAAU,EACV,OAGC;IAED,uCAAuC;IACvC,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,IAAI,GAAG,CAAC;IAC5C,2BAA2B;IAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAEnC,sBAAsB;IACtB,IAAI,OAAO,GAAQ,GAAG,CAAC;IACvB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACrB,IAAI,OAAO,IAAI,IAAI,IAAI,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC,EAAE,CAAC;YACvC,4DAA4D;YAC5D,OAAQ,OAAO,EAAE,YAAoB;mBAC7B,SAA4C,CAAC;QACzD,CAAC;QACD,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAED,iEAAiE;IACjE,OAAO,OAAyC,CAAC;AACrD,CAAC"} \ No newline at end of file diff --git a/packages/media/_cli.d.ts b/packages/media/_cli.d.ts index 9b1c90b4..d3c6fab6 100644 --- a/packages/media/_cli.d.ts +++ b/packages/media/_cli.d.ts @@ -1,4 +1,4 @@ -import { IConvertVideoOptions, IResizeOptions } from './types'; -export declare const defaults: () => void; -export declare const sanitize: (argv: any) => IResizeOptions; -export declare const sanitizeVideo: (argv: any) => IConvertVideoOptions; +import { IConvertVideoOptions, IResizeOptions } from './types'; +export declare const defaults: () => void; +export declare const sanitize: (argv: any) => IResizeOptions; +export declare const sanitizeVideo: (argv: any) => IConvertVideoOptions; diff --git a/packages/media/_cli.js b/packages/media/_cli.js index a4505282..cf81054e 100644 --- a/packages/media/_cli.js +++ b/packages/media/_cli.js @@ -1,146 +1,146 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.sanitizeVideo = exports.sanitize = exports.defaults = void 0; -const osr_commons_1 = require("@plastichub/osr-commons"); -const osr_commons_2 = require("@plastichub/osr-commons"); -const exists_1 = require("@plastichub/fs/exists"); -const images_1 = require("./lib/media/images"); -const _1 = require("./"); -const globBase = require('glob-base'); -const defaults = () => { - const DefaultCommand = 'info'; - if (process.argv.length === 2) { - process.argv.push(DefaultCommand); - } - process.on('unhandledRejection', (reason) => { - console.error('Unhandled rejection, reason: ', reason); - }); -}; -exports.defaults = defaults; -const sanitize = (argv) => { - const options = { - src: argv.src, - dst: argv.dst, - debug: argv.debug, - dry: argv.dry, - alt: argv.alt, - percent: argv.percent, - width: argv.width === false ? undefined : argv.width, - height: argv.height === false ? undefined : argv.height, - minWidth: argv.minWidth === false ? undefined : argv.minWidth, - minHeight: argv.minHeight === false ? undefined : argv.minHeight, - minSize: argv.minSize === false ? undefined : argv.minSize, - fit: argv.fit, - position: argv.position, - logLevel: argv.logLevel, - withoutEnlargement: argv.withoutEnlargement, - withoutReduction: argv.withoutReduction, - fastShrinkOnLoad: argv.fastShrinkOnLoad, - background: argv.background, - ...argv - }; - let srcInfo; - let variables = { - IMAGES: images_1.GLOB_BASIC, - ...options.variables - }; - if (options.src) { - const srcIn = (0, osr_commons_2.resolve)(options.src, options.alt, variables); - options.src = (0, osr_commons_1.forward_slash)((0, _1.substitute)(options.alt, srcIn, variables)); - // in case a file with a glob pattern is provided, strip the glob - // this is a special case, enabling shared scripts in Alt-Tap Salamand - const glob_base = globBase(options.src); - const file = options.src.replace(glob_base.glob, '').replace(/\/$/, ''); - if ((0, exists_1.sync)(file) && (0, osr_commons_2.isFile)(file)) { - options.src = file; - } - srcInfo = (0, osr_commons_1.pathInfo)((0, osr_commons_2.resolve)(options.src, options.alt, variables)); - if (srcInfo && srcInfo.FILES && srcInfo.FILES.length) { - options.srcInfo = srcInfo; - for (const key in srcInfo) { - if (Object.prototype.hasOwnProperty.call(srcInfo, key)) { - variables['SRC_' + key] = srcInfo[key]; - } - } - } - else { - options.src = (0, osr_commons_2.resolve)(options.src, options.alt, variables); - } - } - options.dstInfo = (0, osr_commons_1.pathInfoEx)(options.dst || ""); - if (options.dstInfo && options.dst) { - if (options.srcInfo && options.dstInfo) { - options.dstInfo.PATH = options.dst; - for (const key in options.dstInfo) { - if (Object.prototype.hasOwnProperty.call(options.dstInfo, key)) { - variables['DST_' + key] = options.dstInfo[key]; - } - } - } - else { - options.dst = (0, osr_commons_2.resolve)(options.dst || '', options.alt, variables); - } - } - options.variables = variables; - return options; -}; -exports.sanitize = sanitize; -const sanitizeVideo = (argv) => { - const options = { - src: argv.src, - dst: argv.dst, - dry: argv.dry, - alt: argv.alt, - verb: argv.verb, - audio: argv.audio, - percent: argv.percent, - logLevel: argv.logLevel, - ...argv - }; - let srcInfo; - let variables = { - IMAGES: images_1.GLOB_BASIC, - ...options.variables - }; - if (options.src) { - const srcIn = (0, osr_commons_2.resolve)(options.src, options.alt, variables); - options.src = (0, osr_commons_1.forward_slash)((0, _1.substitute)(options.alt, srcIn, variables)); - // in case a file with a glob pattern is provided, strip the glob - // this is a special case, enabling shared scripts in Alt-Tap Salamand - const glob_base = globBase(options.src); - const file = options.src.replace(glob_base.glob, '').replace(/\/$/, ''); - if ((0, exists_1.sync)(file) && (0, osr_commons_2.isFile)(file)) { - options.src = file; - } - srcInfo = (0, osr_commons_1.pathInfo)((0, osr_commons_2.resolve)(options.src, options.alt, variables)); - if (srcInfo && srcInfo.FILES && srcInfo.FILES.length) { - options.srcInfo = srcInfo; - for (const key in srcInfo) { - if (Object.prototype.hasOwnProperty.call(srcInfo, key)) { - variables['SRC_' + key] = srcInfo[key]; - } - } - } - else { - options.src = (0, osr_commons_2.resolve)(options.src, options.alt, variables); - } - } - options.dstInfo = (0, osr_commons_1.pathInfoEx)(options.dst || ""); - if (options.dstInfo && options.dst) { - if (options.srcInfo && options.dstInfo) { - options.dstInfo.PATH = options.dst; - for (const key in options.dstInfo) { - if (Object.prototype.hasOwnProperty.call(options.dstInfo, key)) { - variables['DST_' + key] = options.dstInfo[key]; - } - } - } - else { - options.dst = (0, osr_commons_2.resolve)(options.dst || '', options.alt, variables); - } - } - options.variables = variables; - return options; -}; -exports.sanitizeVideo = sanitizeVideo; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiX2NsaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInNyYy9fY2xpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHlEQUE2RTtBQUM3RSx5REFBeUQ7QUFDekQsa0RBQXNEO0FBQ3RELCtDQUErQztBQUMvQyx5QkFBK0I7QUFFL0IsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFBO0FBRTlCLE1BQU0sUUFBUSxHQUFHLEdBQUcsRUFBRTtJQUN6QixNQUFNLGNBQWMsR0FBRyxNQUFNLENBQUM7SUFDOUIsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUU7UUFDM0IsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUM7S0FDckM7SUFDRCxPQUFPLENBQUMsRUFBRSxDQUFDLG9CQUFvQixFQUFFLENBQUMsTUFBYyxFQUFFLEVBQUU7UUFDaEQsT0FBTyxDQUFDLEtBQUssQ0FBQywrQkFBK0IsRUFBRSxNQUFNLENBQUMsQ0FBQTtJQUMxRCxDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQTtBQVJZLFFBQUEsUUFBUSxZQVFwQjtBQUVNLE1BQU0sUUFBUSxHQUFHLENBQUMsSUFBUyxFQUFtQixFQUFFO0lBRW5ELE1BQU0sT0FBTyxHQUFtQjtRQUM1QixHQUFHLEVBQUUsSUFBSSxDQUFDLEdBQUc7UUFDYixHQUFHLEVBQUUsSUFBSSxDQUFDLEdBQUc7UUFDYixLQUFLLEVBQUUsSUFBSSxDQUFDLEtBQUs7UUFDakIsR0FBRyxFQUFFLElBQUksQ0FBQyxHQUFHO1FBQ2IsR0FBRyxFQUFFLElBQUksQ0FBQyxHQUFHO1FBQ2IsT0FBTyxFQUFFLElBQUksQ0FBQyxPQUFPO1FBQ3JCLEtBQUssRUFBRSxJQUFJLENBQUMsS0FBSyxLQUFLLEtBQUssQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSztRQUNwRCxNQUFNLEVBQUUsSUFB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 \ No newline at end of file +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.sanitizeVideo = exports.sanitize = exports.defaults = void 0; +const osr_commons_1 = require("@plastichub/osr-commons"); +const osr_commons_2 = require("@plastichub/osr-commons"); +const exists_1 = require("@plastichub/fs/exists"); +const images_1 = require("./lib/media/images"); +const _1 = require("./"); +const globBase = require('glob-base'); +const defaults = () => { + const DefaultCommand = 'info'; + if (process.argv.length === 2) { + process.argv.push(DefaultCommand); + } + process.on('unhandledRejection', (reason) => { + console.error('Unhandled rejection, reason: ', reason); + }); +}; +exports.defaults = defaults; +const sanitize = (argv) => { + const options = { + src: argv.src, + dst: argv.dst, + debug: argv.debug, + dry: argv.dry, + alt: argv.alt, + percent: argv.percent, + width: argv.width === false ? undefined : argv.width, + height: argv.height === false ? undefined : argv.height, + minWidth: argv.minWidth === false ? undefined : argv.minWidth, + minHeight: argv.minHeight === false ? undefined : argv.minHeight, + minSize: argv.minSize === false ? undefined : argv.minSize, + fit: argv.fit, + position: argv.position, + logLevel: argv.logLevel, + withoutEnlargement: argv.withoutEnlargement, + withoutReduction: argv.withoutReduction, + fastShrinkOnLoad: argv.fastShrinkOnLoad, + background: argv.background, + ...argv + }; + let srcInfo; + let variables = { + IMAGES: images_1.GLOB_BASIC, + ...options.variables + }; + if (options.src) { + const srcIn = (0, osr_commons_2.resolve)(options.src, options.alt, variables); + options.src = (0, osr_commons_1.forward_slash)((0, _1.substitute)(options.alt, srcIn, variables)); + // in case a file with a glob pattern is provided, strip the glob + // this is a special case, enabling shared scripts in Alt-Tap Salamand + const glob_base = globBase(options.src); + const file = options.src.replace(glob_base.glob, '').replace(/\/$/, ''); + if ((0, exists_1.sync)(file) && (0, osr_commons_2.isFile)(file)) { + options.src = file; + } + srcInfo = (0, osr_commons_1.pathInfo)((0, osr_commons_2.resolve)(options.src, options.alt, variables)); + if (srcInfo && srcInfo.FILES && srcInfo.FILES.length) { + options.srcInfo = srcInfo; + for (const key in srcInfo) { + if (Object.prototype.hasOwnProperty.call(srcInfo, key)) { + variables['SRC_' + key] = srcInfo[key]; + } + } + } + else { + options.src = (0, osr_commons_2.resolve)(options.src, options.alt, variables); + } + } + options.dstInfo = (0, osr_commons_1.pathInfoEx)(options.dst || ""); + if (options.dstInfo && options.dst) { + if (options.srcInfo && options.dstInfo) { + options.dstInfo.PATH = options.dst; + for (const key in options.dstInfo) { + if (Object.prototype.hasOwnProperty.call(options.dstInfo, key)) { + variables['DST_' + key] = options.dstInfo[key]; + } + } + } + else { + options.dst = (0, osr_commons_2.resolve)(options.dst || '', options.alt, variables); + } + } + options.variables = variables; + return options; +}; +exports.sanitize = sanitize; +const sanitizeVideo = (argv) => { + const options = { + src: argv.src, + dst: argv.dst, + dry: argv.dry, + alt: argv.alt, + verb: argv.verb, + audio: argv.audio, + percent: argv.percent, + logLevel: argv.logLevel, + ...argv + }; + let srcInfo; + let variables = { + IMAGES: images_1.GLOB_BASIC, + ...options.variables + }; + if (options.src) { + const srcIn = (0, osr_commons_2.resolve)(options.src, options.alt, variables); + options.src = (0, osr_commons_1.forward_slash)((0, _1.substitute)(options.alt, srcIn, variables)); + // in case a file with a glob pattern is provided, strip the glob + // this is a special case, enabling shared scripts in Alt-Tap Salamand + const glob_base = globBase(options.src); + const file = options.src.replace(glob_base.glob, '').replace(/\/$/, ''); + if ((0, exists_1.sync)(file) && (0, osr_commons_2.isFile)(file)) { + options.src = file; + } + srcInfo = (0, osr_commons_1.pathInfo)((0, osr_commons_2.resolve)(options.src, options.alt, variables)); + if (srcInfo && srcInfo.FILES && srcInfo.FILES.length) { + options.srcInfo = srcInfo; + for (const key in srcInfo) { + if (Object.prototype.hasOwnProperty.call(srcInfo, key)) { + variables['SRC_' + key] = srcInfo[key]; + } + } + } + else { + options.src = (0, osr_commons_2.resolve)(options.src, options.alt, variables); + } + } + options.dstInfo = (0, osr_commons_1.pathInfoEx)(options.dst || ""); + if (options.dstInfo && options.dst) { + if (options.srcInfo && options.dstInfo) { + options.dstInfo.PATH = options.dst; + for (const key in options.dstInfo) { + if (Object.prototype.hasOwnProperty.call(options.dstInfo, key)) { + variables['DST_' + key] = options.dstInfo[key]; + } + } + } + else { + options.dst = (0, osr_commons_2.resolve)(options.dst || '', options.alt, variables); + } + } + options.variables = variables; + return options; +}; +exports.sanitizeVideo = sanitizeVideo; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiX2NsaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInNyYy9fY2xpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHlEQUE2RTtBQUM3RSx5REFBeUQ7QUFDekQsa0RBQXNEO0FBQ3RELCtDQUErQztBQUMvQyx5QkFBK0I7QUFFL0IsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFBO0FBRTlCLE1BQU0sUUFBUSxHQUFHLEdBQUcsRUFBRTtJQUN6QixNQUFNLGNBQWMsR0FBRyxNQUFNLENBQUM7SUFDOUIsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztRQUM1QixPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQztJQUN0QyxDQUFDO0lBQ0QsT0FBTyxDQUFDLEVBQUUsQ0FBQyxvQkFBb0IsRUFBRSxDQUFDLE1BQWMsRUFBRSxFQUFFO1FBQ2hELE9BQU8sQ0FBQyxLQUFLLENBQUMsK0JBQStCLEVBQUUsTUFBTSxDQUFDLENBQUE7SUFDMUQsQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDLENBQUE7QUFSWSxRQUFBLFFBQVEsWUFRcEI7QUFFTSxNQUFNLFFBQVEsR0FBRyxDQUFDLElBQVMsRUFBbUIsRUFBRTtJQUVuRCxNQUFNLE9BQU8sR0FBbUI7UUFDNUIsR0FBRyxFQUFFLElBQUksQ0FBQyxHQUFHO1FBQ2IsR0FBRyxFQUFFLElBQUksQ0FBQyxHQUFHO1FBQ2IsS0FBSyxFQUFFLElBQUksQ0FBQyxLQUFLO1FBQ2pCLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRztRQUNiLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRztRQUNiLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTztRQUNyQixLQUFLLEVBQUUsSUFBSSxDQUFDLEtBQUssS0FBSyxLQUFLLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEtBQUs7UUFDcEQsTUFB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 \ No newline at end of file diff --git a/packages/media/commands/audio.d.ts b/packages/media/commands/audio.d.ts index 1cc7da26..3298fb71 100644 --- a/packages/media/commands/audio.d.ts +++ b/packages/media/commands/audio.d.ts @@ -1,11 +1,3 @@ -import * as CLI from 'yargs'; -export declare const defaultOptions: (yargs: CLI.Argv) => CLI.Argv<{ - src: unknown; -} & { - dst: unknown; -} & { - debug: boolean; -} & { - alt: boolean; -}>; -export declare const register: (cli: CLI.Argv) => CLI.Argv<{}>; +import * as CLI from 'yargs'; +export declare const defaultOptions: (yargs: CLI.Argv) => any; +export declare const register: (cli: CLI.Argv) => any; diff --git a/packages/media/commands/audio.js b/packages/media/commands/audio.js index da861d56..284c7c35 100644 --- a/packages/media/commands/audio.js +++ b/packages/media/commands/audio.js @@ -1,36 +1,36 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.register = exports.defaultOptions = void 0; -const __1 = require("../"); -const convert_1 = require("../lib/media/audio/convert"); -const _cli_1 = require("../_cli"); -const defaultOptions = (yargs) => { - return yargs.option('src', { - describe: 'FILE|FOLDER|GLOB', - demandOption: true - }).option('dst', { - describe: 'FILE|FOLDER|GLOB' - }).option('debug', { - default: false, - describe: 'Enable internal debug messages', - type: 'boolean' - }).option('alt', { - default: false, - describe: 'Use alternate tokenizer, & instead of $', - type: 'boolean' - }); -}; -exports.defaultOptions = defaultOptions; -let options = (yargs) => (0, exports.defaultOptions)(yargs); -const register = (cli) => { - return cli.command('video ', 'Convert video', options, (argv) => { - (0, _cli_1.defaults)(); - const options = (0, _cli_1.sanitizeVideo)(argv); - __1.logger.info("options " + argv.dst, options); - if (argv.verb = 'convert') { - return (0, convert_1.convert)(options); - } - }); -}; -exports.register = register; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXVkaW8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29tbWFuZHMvYXVkaW8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsMkJBQTRCO0FBQzVCLHdEQUFvRDtBQUVwRCxrQ0FBaUQ7QUFHMUMsTUFBTSxjQUFjLEdBQUcsQ0FBQyxLQUFlLEVBQUUsRUFBRTtJQUM5QyxPQUFPLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFO1FBQ3ZCLFFBQVEsRUFBRSxrQkFBa0I7UUFDNUIsWUFBWSxFQUFFLElBQUk7S0FDckIsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUU7UUFDYixRQUFRLEVBQUUsa0JBQWtCO0tBQy9CLENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFO1FBQ2YsT0FBTyxFQUFFLEtBQUs7UUFDZCxRQUFRLEVBQUUsZ0NBQWdDO1FBQzFDLElBQUksRUFBRSxTQUFTO0tBQ2xCLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFO1FBQ2IsT0FBTyxFQUFFLEtBQUs7UUFDZCxRQUFRLEVBQUUseUNBQXlDO1FBQ25ELElBQUksRUFBRSxTQUFTO0tBQ2xCLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQTtBQWZZLFFBQUEsY0FBYyxrQkFlMUI7QUFFRCxJQUFJLE9BQU8sR0FBRyxDQUFDLEtBQWUsRUFBRSxFQUFFLENBQUMsSUFBQSxzQkFBYyxFQUFDLEtBQUssQ0FBQyxDQUFBO0FBRWpELE1BQU0sUUFBUSxHQUFHLENBQUMsR0FBYSxFQUFFLEVBQUU7SUFDdEMsT0FBTyxHQUFHLENBQUMsT0FBTyxDQUFDLGNBQWMsRUFBRSxlQUFlLEVBQUUsT0FBTyxFQUFFLENBQUMsSUFBbUIsRUFBRSxFQUFFO1FBQ2pGLElBQUEsZUFBUSxHQUFFLENBQUE7UUFDVixNQUFNLE9BQU8sR0FBRyxJQUFBLG9CQUFhLEVBQUMsSUFBSSxDQUF5QixDQUFBO1FBQzNELFVBQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxHQUFHLElBQUksQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDLENBQUE7UUFDM0MsSUFBSSxJQUFJLENBQUMsSUFBSSxHQUFHLFNBQVMsRUFBRTtZQUN2QixPQUFPLElBQUEsaUJBQU8sRUFBQyxPQUFPLENBQUMsQ0FBQTtTQUMxQjtJQUNMLENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFBO0FBVFksUUFBQSxRQUFRLFlBU3BCIn0= \ No newline at end of file +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.register = exports.defaultOptions = void 0; +const __1 = require("../"); +const convert_1 = require("../lib/media/audio/convert"); +const _cli_1 = require("../_cli"); +const defaultOptions = (yargs) => { + return yargs.option('src', { + describe: 'FILE|FOLDER|GLOB', + demandOption: true + }).option('dst', { + describe: 'FILE|FOLDER|GLOB' + }).option('debug', { + default: false, + describe: 'Enable internal debug messages', + type: 'boolean' + }).option('alt', { + default: false, + describe: 'Use alternate tokenizer, & instead of $', + type: 'boolean' + }); +}; +exports.defaultOptions = defaultOptions; +let options = (yargs) => (0, exports.defaultOptions)(yargs); +const register = (cli) => { + return cli.command('video ', 'Convert video', options, (argv) => { + (0, _cli_1.defaults)(); + const options = (0, _cli_1.sanitizeVideo)(argv); + __1.logger.info("options " + argv.dst, options); + if (argv.verb = 'convert') { + return (0, convert_1.convert)(options); + } + }); +}; +exports.register = register; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXVkaW8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29tbWFuZHMvYXVkaW8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsMkJBQTRCO0FBQzVCLHdEQUFvRDtBQUVwRCxrQ0FBaUQ7QUFHMUMsTUFBTSxjQUFjLEdBQUcsQ0FBQyxLQUFlLEVBQUUsRUFBRTtJQUM5QyxPQUFPLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFO1FBQ3ZCLFFBQVEsRUFBRSxrQkFBa0I7UUFDNUIsWUFBWSxFQUFFLElBQUk7S0FDckIsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUU7UUFDYixRQUFRLEVBQUUsa0JBQWtCO0tBQy9CLENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFO1FBQ2YsT0FBTyxFQUFFLEtBQUs7UUFDZCxRQUFRLEVBQUUsZ0NBQWdDO1FBQzFDLElBQUksRUFBRSxTQUFTO0tBQ2xCLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFO1FBQ2IsT0FBTyxFQUFFLEtBQUs7UUFDZCxRQUFRLEVBQUUseUNBQXlDO1FBQ25ELElBQUksRUFBRSxTQUFTO0tBQ2xCLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQTtBQWZZLFFBQUEsY0FBYyxrQkFlMUI7QUFFRCxJQUFJLE9BQU8sR0FBRyxDQUFDLEtBQWUsRUFBRSxFQUFFLENBQUMsSUFBQSxzQkFBYyxFQUFDLEtBQUssQ0FBQyxDQUFBO0FBRWpELE1BQU0sUUFBUSxHQUFHLENBQUMsR0FBYSxFQUFFLEVBQUU7SUFDdEMsT0FBTyxHQUFHLENBQUMsT0FBTyxDQUFDLGNBQWMsRUFBRSxlQUFlLEVBQUUsT0FBTyxFQUFFLENBQUMsSUFBbUIsRUFBRSxFQUFFO1FBQ2pGLElBQUEsZUFBUSxHQUFFLENBQUE7UUFDVixNQUFNLE9BQU8sR0FBRyxJQUFBLG9CQUFhLEVBQUMsSUFBSSxDQUF5QixDQUFBO1FBQzNELFVBQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxHQUFHLElBQUksQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDLENBQUE7UUFDM0MsSUFBSSxJQUFJLENBQUMsSUFBSSxHQUFHLFNBQVMsRUFBRSxDQUFDO1lBQ3hCLE9BQU8sSUFBQSxpQkFBTyxFQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQzNCLENBQUM7SUFDTCxDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQTtBQVRZLFFBQUEsUUFBUSxZQVNwQiJ9 \ No newline at end of file diff --git a/packages/media/commands/convert.d.ts b/packages/media/commands/convert.d.ts index 88b52997..3298fb71 100644 --- a/packages/media/commands/convert.d.ts +++ b/packages/media/commands/convert.d.ts @@ -1,15 +1,3 @@ -import * as CLI from 'yargs'; -export declare const defaultOptions: (yargs: CLI.Argv) => CLI.Argv<{ - src: unknown; -} & { - dst: unknown; -} & { - debug: boolean; -} & { - alt: boolean; -} & { - dry: boolean; -} & { - verbose: boolean; -}>; -export declare const register: (cli: CLI.Argv) => CLI.Argv<{}>; +import * as CLI from 'yargs'; +export declare const defaultOptions: (yargs: CLI.Argv) => any; +export declare const register: (cli: CLI.Argv) => any; diff --git a/packages/media/commands/convert.js b/packages/media/commands/convert.js index f8458a99..feb8545c 100644 --- a/packages/media/commands/convert.js +++ b/packages/media/commands/convert.js @@ -1,42 +1,42 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.register = exports.defaultOptions = void 0; -const __1 = require("../"); -const images_1 = require("../lib/media/images"); -const _cli_1 = require("../_cli"); -const defaultOptions = (yargs) => { - return yargs.option('src', { - describe: 'FILE|FOLDER|GLOB', - demandOption: true - }).option('dst', { - describe: 'FILE|FOLDER|GLOB' - }).option('debug', { - default: false, - describe: 'Enable internal debug messages', - type: 'boolean' - }).option('alt', { - default: false, - describe: 'Use alternate tokenizer, & instead of $', - type: 'boolean' - }).option('dry', { - default: false, - describe: 'Run without conversion', - type: 'boolean' - }).option('verbose', { - default: false, - describe: 'Show internal messages', - type: 'boolean' - }); -}; -exports.defaultOptions = defaultOptions; -let options = (yargs) => (0, exports.defaultOptions)(yargs); -const register = (cli) => { - return cli.command('convert', 'Convert files', options, (argv) => { - (0, _cli_1.defaults)(); - const options = (0, _cli_1.sanitizeVideo)(argv); - options.debug && __1.logger.info("options " + argv.dst, options); - return (0, images_1.convert)(options); - }); -}; -exports.register = register; +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.register = exports.defaultOptions = void 0; +const __1 = require("../"); +const images_1 = require("../lib/media/images"); +const _cli_1 = require("../_cli"); +const defaultOptions = (yargs) => { + return yargs.option('src', { + describe: 'FILE|FOLDER|GLOB', + demandOption: true + }).option('dst', { + describe: 'FILE|FOLDER|GLOB' + }).option('debug', { + default: false, + describe: 'Enable internal debug messages', + type: 'boolean' + }).option('alt', { + default: false, + describe: 'Use alternate tokenizer, & instead of $', + type: 'boolean' + }).option('dry', { + default: false, + describe: 'Run without conversion', + type: 'boolean' + }).option('verbose', { + default: false, + describe: 'Show internal messages', + type: 'boolean' + }); +}; +exports.defaultOptions = defaultOptions; +let options = (yargs) => (0, exports.defaultOptions)(yargs); +const register = (cli) => { + return cli.command('convert', 'Convert files', options, (argv) => { + (0, _cli_1.defaults)(); + const options = (0, _cli_1.sanitizeVideo)(argv); + options.debug && __1.logger.info("options " + argv.dst, options); + return (0, images_1.convert)(options); + }); +}; +exports.register = register; //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udmVydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9jb21tYW5kcy9jb252ZXJ0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLDJCQUE0QjtBQUU1QixnREFFNEI7QUFFNUIsa0NBSWdCO0FBT1QsTUFBTSxjQUFjLEdBQUcsQ0FBQyxLQUFlLEVBQUUsRUFBRTtJQUM5QyxPQUFPLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFO1FBQ3ZCLFFBQVEsRUFBRSxrQkFBa0I7UUFDNUIsWUFBWSxFQUFFLElBQUk7S0FDckIsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUU7UUFDYixRQUFRLEVBQUUsa0JBQWtCO0tBQy9CLENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFO1FBQ2YsT0FBTyxFQUFFLEtBQUs7UUFDZCxRQUFRLEVBQUUsZ0NBQWdDO1FBQzFDLElBQUksRUFBRSxTQUFTO0tBQ2xCLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFO1FBQ2IsT0FBTyxFQUFFLEtBQUs7UUFDZCxRQUFRLEVBQUUseUNBQXlDO1FBQ25ELElBQUksRUFBRSxTQUFTO0tBQ2xCLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFO1FBQ2IsT0FBTyxFQUFFLEtBQUs7UUFDZCxRQUFRLEVBQUUsd0JBQXdCO1FBQ2xDLElBQUksRUFBRSxTQUFTO0tBQ2xCLENBQUMsQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFO1FBQ2pCLE9BQU8sRUFBRSxLQUFLO1FBQ2QsUUFBUSxFQUFFLHdCQUF3QjtRQUNsQyxJQUFJLEVBQUUsU0FBUztLQUNsQixDQUFDLENBQUE7QUFDTixDQUFDLENBQUE7QUF2QlksUUFBQSxjQUFjLGtCQXVCMUI7QUFFRCxJQUFJLE9BQU8sR0FBRyxDQUFDLEtBQWUsRUFBRSxFQUFFLENBQUMsSUFBQSxzQkFBYyxFQUFDLEtBQUssQ0FBQyxDQUFBO0FBRWpELE1BQU0sUUFBUSxHQUFHLENBQUMsR0FBYSxFQUFFLEVBQUU7SUFDdEMsT0FBTyxHQUFHLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSxlQUFlLEVBQUUsT0FBTyxFQUFFLENBQUMsSUFBbUIsRUFBRSxFQUFFO1FBQzVFLElBQUEsZUFBUSxHQUFFLENBQUE7UUFDVixNQUFNLE9BQU8sR0FBRyxJQUFBLG9CQUFhLEVBQUMsSUFBSSxDQUFhLENBQUE7UUFDL0MsT0FBTyxDQUFDLEtBQUssSUFBSSxVQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLE9BQU8sQ0FBQyxDQUFBO1FBQzVELE9BQU8sSUFBQSxnQkFBTyxFQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQzNCLENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFBO0FBUFksUUFBQSxRQUFRLFlBT3BCIn0= \ No newline at end of file diff --git a/packages/media/commands/pdf2jpg.d.ts b/packages/media/commands/pdf2jpg.d.ts index 443f33e5..ca73784e 100644 --- a/packages/media/commands/pdf2jpg.d.ts +++ b/packages/media/commands/pdf2jpg.d.ts @@ -1,2 +1,2 @@ -import * as CLI from 'yargs'; -export declare const register: (cli: CLI.Argv) => CLI.Argv<{}>; +import * as CLI from 'yargs'; +export declare const register: (cli: CLI.Argv) => any; diff --git a/packages/media/commands/pdf2jpg.js b/packages/media/commands/pdf2jpg.js index 05400291..14fff749 100644 --- a/packages/media/commands/pdf2jpg.js +++ b/packages/media/commands/pdf2jpg.js @@ -1,53 +1,53 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.register = void 0; -const __1 = require("../"); -const path = require("path"); -const index_1 = require("../lib/process/index"); -const pMap = require("p-map"); -const fg = require('fast-glob'); -const defaultOptions = (yargs) => { - return yargs.option('input', { - default: './', - describe: 'The sources' - }).option('debug', { - default: 'false', - describe: 'Enable internal debug message' - }); -}; -let options = (yargs) => defaultOptions(yargs); -async function convertFiles(files) { - return pMap(files, (file) => { - const inParts = path.parse(file); - // magick convert leg.pdf -quality 100 -density 250 -trim -flatten -resize 200% -sharpen 0x1.0 leg.jpg - const promise = index_1.Helper.run(inParts.dir, 'convert', [ - `"${inParts.base}[0]"`, - '-quality 80', - '-density 250', - '-trim', - '-flatten', - '-sharpen 0x1.0', - `"${inParts.name}.jpg"` - ]); - return promise; - }, { concurrency: 1 }); -} -// node ./build/main.js pdf2jpg --input=../drawings -const register = (cli) => { - return cli.command('pdf2jpg', '', options, async (argv) => { - if (argv.help) { - return; - } - const src = path.resolve('' + argv.input); - if (argv.debug) { - __1.logger.debug(`Begin convert PDF files${src}`); - } - const files = fg.sync('*.pdf|*.PDF', { dot: true, cwd: src, absolute: true }); - await convertFiles(files); - if (argv.debug) { - __1.logger.debug(`Converted ${files.length} files`); - } - }); -}; -exports.register = register; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGRmMmpwZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9jb21tYW5kcy9wZGYyanBnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLDJCQUE0QjtBQUM1Qiw2QkFBNEI7QUFDNUIsZ0RBQTZDO0FBQzdDLDhCQUE2QjtBQUU3QixNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUE7QUFFL0IsTUFBTSxjQUFjLEdBQUcsQ0FBQyxLQUFlLEVBQUUsRUFBRTtJQUN2QyxPQUFPLEtBQUssQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFO1FBQ3pCLE9BQU8sRUFBRSxJQUFJO1FBQ2IsUUFBUSxFQUFFLGFBQWE7S0FDMUIsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUU7UUFDZixPQUFPLEVBQUUsT0FBTztRQUNoQixRQUFRLEVBQUUsK0JBQStCO0tBQzVDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQztBQUVGLElBQUksT0FBTyxHQUFHLENBQUMsS0FBZSxFQUFFLEVBQUUsQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLENBQUM7QUFFekQsS0FBSyxVQUFVLFlBQVksQ0FBQyxLQUFLO0lBQzdCLE9BQU8sSUFBSSxDQUFDLEtBQUssRUFBQyxDQUFDLElBQVMsRUFBRSxFQUFFO1FBQzVCLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDakMsc0dBQXNHO1FBQ3RHLE1BQU0sT0FBTyxHQUFHLGNBQU0sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxTQUFTLEVBQ2pEO1lBQ0ksSUFBSSxPQUFPLENBQUMsSUFBSSxNQUFNO1lBQ3RCLGFBQWE7WUFDYixjQUFjO1lBQ2QsT0FBTztZQUNQLFVBQVU7WUFDVixnQkFBZ0I7WUFDaEIsSUFBSSxPQUFPLENBQUMsSUFBSSxPQUFPO1NBQzFCLENBQUMsQ0FBQztRQUNILE9BQU8sT0FBTyxDQUFDO0lBQ25CLENBQUMsRUFBQyxFQUFFLFdBQVcsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0FBQzFCLENBQUM7QUFFRCxtREFBbUQ7QUFDNUMsTUFBTSxRQUFRLEdBQUcsQ0FBQyxHQUFhLEVBQUUsRUFBRTtJQUN0QyxPQUFPLEdBQUcsQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLEVBQUUsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLElBQW1CLEVBQUUsRUFBRTtRQUNyRSxJQUFJLElBQUksQ0FBQyxJQUFJLEVBQUU7WUFBRSxPQUFPO1NBQUU7UUFDMUIsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzFDLElBQUksSUFBSSxDQUFDLEtBQUssRUFBRTtZQUNaLFVBQU0sQ0FBQyxLQUFLLENBQUMsMEJBQTBCLEdBQUcsRUFBRSxDQUFDLENBQUM7U0FDakQ7UUFDRCxNQUFNLEtBQUssR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLGFBQWEsRUFBRSxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUM5RSxNQUFNLFlBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUMxQixJQUFJLElBQUksQ0FBQyxLQUFLLEVBQUU7WUFDWixVQUFNLENBQUMsS0FBSyxDQUFDLGFBQWEsS0FBSyxDQUFDLE1BQU0sUUFBUSxDQUFDLENBQUM7U0FDbkQ7SUFDTCxDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQTtBQWJZLFFBQUEsUUFBUSxZQWFwQiJ9 \ No newline at end of file +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.register = void 0; +const __1 = require("../"); +const path = require("path"); +const index_1 = require("../lib/process/index"); +const pMap = require("p-map"); +const fg = require('fast-glob'); +const defaultOptions = (yargs) => { + return yargs.option('input', { + default: './', + describe: 'The sources' + }).option('debug', { + default: 'false', + describe: 'Enable internal debug message' + }); +}; +let options = (yargs) => defaultOptions(yargs); +async function convertFiles(files) { + return pMap(files, (file) => { + const inParts = path.parse(file); + // magick convert leg.pdf -quality 100 -density 250 -trim -flatten -resize 200% -sharpen 0x1.0 leg.jpg + const promise = index_1.Helper.run(inParts.dir, 'convert', [ + `"${inParts.base}[0]"`, + '-quality 80', + '-density 250', + '-trim', + '-flatten', + '-sharpen 0x1.0', + `"${inParts.name}.jpg"` + ]); + return promise; + }, { concurrency: 1 }); +} +// node ./build/main.js pdf2jpg --input=../drawings +const register = (cli) => { + return cli.command('pdf2jpg', '', options, async (argv) => { + if (argv.help) { + return; + } + const src = path.resolve('' + argv.input); + if (argv.debug) { + __1.logger.debug(`Begin convert PDF files${src}`); + } + const files = fg.sync('*.pdf|*.PDF', { dot: true, cwd: src, absolute: true }); + await convertFiles(files); + if (argv.debug) { + __1.logger.debug(`Converted ${files.length} files`); + } + }); +}; +exports.register = register; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGRmMmpwZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9jb21tYW5kcy9wZGYyanBnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLDJCQUE0QjtBQUM1Qiw2QkFBNEI7QUFDNUIsZ0RBQTZDO0FBQzdDLDhCQUE2QjtBQUU3QixNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUE7QUFFL0IsTUFBTSxjQUFjLEdBQUcsQ0FBQyxLQUFlLEVBQUUsRUFBRTtJQUN2QyxPQUFPLEtBQUssQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFO1FBQ3pCLE9BQU8sRUFBRSxJQUFJO1FBQ2IsUUFBUSxFQUFFLGFBQWE7S0FDMUIsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUU7UUFDZixPQUFPLEVBQUUsT0FBTztRQUNoQixRQUFRLEVBQUUsK0JBQStCO0tBQzVDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQztBQUVGLElBQUksT0FBTyxHQUFHLENBQUMsS0FBZSxFQUFFLEVBQUUsQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLENBQUM7QUFFekQsS0FBSyxVQUFVLFlBQVksQ0FBQyxLQUFLO0lBQzdCLE9BQU8sSUFBSSxDQUFDLEtBQUssRUFBQyxDQUFDLElBQVMsRUFBRSxFQUFFO1FBQzVCLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDakMsc0dBQXNHO1FBQ3RHLE1BQU0sT0FBTyxHQUFHLGNBQU0sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxTQUFTLEVBQ2pEO1lBQ0ksSUFBSSxPQUFPLENBQUMsSUFBSSxNQUFNO1lBQ3RCLGFBQWE7WUFDYixjQUFjO1lBQ2QsT0FBTztZQUNQLFVBQVU7WUFDVixnQkFBZ0I7WUFDaEIsSUFBSSxPQUFPLENBQUMsSUFBSSxPQUFPO1NBQzFCLENBQUMsQ0FBQztRQUNILE9BQU8sT0FBTyxDQUFDO0lBQ25CLENBQUMsRUFBQyxFQUFFLFdBQVcsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0FBQzFCLENBQUM7QUFFRCxtREFBbUQ7QUFDNUMsTUFBTSxRQUFRLEdBQUcsQ0FBQyxHQUFhLEVBQUUsRUFBRTtJQUN0QyxPQUFPLEdBQUcsQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLEVBQUUsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLElBQW1CLEVBQUUsRUFBRTtRQUNyRSxJQUFJLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUFDLE9BQU87UUFBQyxDQUFDO1FBQzFCLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUMxQyxJQUFJLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUNiLFVBQU0sQ0FBQyxLQUFLLENBQUMsMEJBQTBCLEdBQUcsRUFBRSxDQUFDLENBQUM7UUFDbEQsQ0FBQztRQUNELE1BQU0sS0FBSyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsYUFBYSxFQUFFLEVBQUUsR0FBRyxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQzlFLE1BQU0sWUFBWSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzFCLElBQUksSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ2IsVUFBTSxDQUFDLEtBQUssQ0FBQyxhQUFhLEtBQUssQ0FBQyxNQUFNLFFBQVEsQ0FBQyxDQUFDO1FBQ3BELENBQUM7SUFDTCxDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQTtBQWJZLFFBQUEsUUFBUSxZQWFwQiJ9 \ No newline at end of file diff --git a/packages/media/commands/resize.d.ts b/packages/media/commands/resize.d.ts index ab92d415..3298fb71 100644 --- a/packages/media/commands/resize.d.ts +++ b/packages/media/commands/resize.d.ts @@ -1,31 +1,3 @@ -import * as CLI from 'yargs'; -export declare const defaultOptions: (yargs: CLI.Argv) => CLI.Argv & { - percent: number; -} & { - logLevel: string; -}>; -export declare const register: (cli: CLI.Argv) => CLI.Argv<{}>; +import * as CLI from 'yargs'; +export declare const defaultOptions: (yargs: CLI.Argv) => any; +export declare const register: (cli: CLI.Argv) => any; diff --git a/packages/media/commands/resize.js b/packages/media/commands/resize.js index d8e69519..561caf7e 100644 --- a/packages/media/commands/resize.js +++ b/packages/media/commands/resize.js @@ -1,71 +1,71 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.register = exports.defaultOptions = void 0; -const index_1 = require("../index"); -const resize_1 = require("../lib/media/images/resize"); -const _cli_1 = require("../_cli"); -const defaultOptions = (yargs) => { - return yargs.option('src', { - describe: 'FILE|FOLDER|GLOB', - demandOption: true - }).option('dst', { - describe: 'FILE|FOLDER|GLOB' - }).option('debug', { - default: false, - describe: 'Enable internal debug messages', - type: 'boolean' - }).option('alt', { - default: false, - describe: 'Use alternate tokenizer, & instead of $', - type: 'boolean' - }).option('dry', { - default: false, - describe: 'Run without conversion', - type: 'boolean' - }).option('verbose', { - default: false, - describe: 'Show internal messages', - type: 'boolean' - }).option('percent', { - default: false, - describe: 'Resize image with percent', - type: 'number' - }).option('width', { - describe: 'Resize image with', - type: 'number' - }).option('height', { - describe: 'Resize image height', - type: 'number' - }).option('minHeight', { - describe: 'Resize image minimum height', - type: 'number' - }).option('minWidth', { - describe: 'Resize image minimum width', - type: 'number' - }).option('minSize', { - describe: 'Resize image size (bytes)', - type: 'number' - }).option('percent', { - describe: 'Resize image in percent (width)', - type: 'number' - }).option('logLevel', { - describe: 'Log level : warn, info, debug, error', - type: 'string', - default: 'info' - }); -}; -exports.defaultOptions = defaultOptions; -let options = (yargs) => (0, exports.defaultOptions)(yargs); -const register = (cli) => { - return cli.command('resize', 'Resizes files', options, async (argv) => { - (0, _cli_1.defaults)(); - const options = (0, _cli_1.sanitize)(argv); - index_1.logger.setSettings({ - minLevel: options.logLevel - }); - index_1.logger.info("options " + argv.dst, options); - await (0, resize_1.resize)(options); - }); -}; -exports.register = register; +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.register = exports.defaultOptions = void 0; +const index_1 = require("../index"); +const resize_1 = require("../lib/media/images/resize"); +const _cli_1 = require("../_cli"); +const defaultOptions = (yargs) => { + return yargs.option('src', { + describe: 'FILE|FOLDER|GLOB', + demandOption: true + }).option('dst', { + describe: 'FILE|FOLDER|GLOB' + }).option('debug', { + default: false, + describe: 'Enable internal debug messages', + type: 'boolean' + }).option('alt', { + default: false, + describe: 'Use alternate tokenizer, & instead of $', + type: 'boolean' + }).option('dry', { + default: false, + describe: 'Run without conversion', + type: 'boolean' + }).option('verbose', { + default: false, + describe: 'Show internal messages', + type: 'boolean' + }).option('percent', { + default: false, + describe: 'Resize image with percent', + type: 'number' + }).option('width', { + describe: 'Resize image with', + type: 'number' + }).option('height', { + describe: 'Resize image height', + type: 'number' + }).option('minHeight', { + describe: 'Resize image minimum height', + type: 'number' + }).option('minWidth', { + describe: 'Resize image minimum width', + type: 'number' + }).option('minSize', { + describe: 'Resize image size (bytes)', + type: 'number' + }).option('percent', { + describe: 'Resize image in percent (width)', + type: 'number' + }).option('logLevel', { + describe: 'Log level : warn, info, debug, error', + type: 'string', + default: 'info' + }); +}; +exports.defaultOptions = defaultOptions; +let options = (yargs) => (0, exports.defaultOptions)(yargs); +const register = (cli) => { + return cli.command('resize', 'Resizes files', options, async (argv) => { + (0, _cli_1.defaults)(); + const options = (0, _cli_1.sanitize)(argv); + index_1.logger.setSettings({ + minLevel: options.logLevel + }); + index_1.logger.info("options " + argv.dst, options); + await (0, resize_1.resize)(options); + }); +}; +exports.register = register; //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzaXplLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbW1hbmRzL3Jlc2l6ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSxvQ0FBaUM7QUFDakMsdURBRW1DO0FBRW5DLGtDQUdnQjtBQU1ULE1BQU0sY0FBYyxHQUFHLENBQUMsS0FBZSxFQUFFLEVBQUU7SUFDOUMsT0FBTyxLQUFLLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRTtRQUN2QixRQUFRLEVBQUUsa0JBQWtCO1FBQzVCLFlBQVksRUFBRSxJQUFJO0tBQ3JCLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFO1FBQ2IsUUFBUSxFQUFFLGtCQUFrQjtLQUMvQixDQUFDLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRTtRQUNmLE9BQU8sRUFBRSxLQUFLO1FBQ2QsUUFBUSxFQUFFLGdDQUFnQztRQUMxQyxJQUFJLEVBQUUsU0FBUztLQUNsQixDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRTtRQUNiLE9BQU8sRUFBRSxLQUFLO1FBQ2QsUUFBUSxFQUFFLHlDQUF5QztRQUNuRCxJQUFJLEVBQUUsU0FBUztLQUNsQixDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRTtRQUNiLE9BQU8sRUFBRSxLQUFLO1FBQ2QsUUFBUSxFQUFFLHdCQUF3QjtRQUNsQyxJQUFJLEVBQUUsU0FBUztLQUNsQixDQUFDLENBQUMsTUFBTSxDQUFDLFNBQVMsRUFBRTtRQUNqQixPQUFPLEVBQUUsS0FBSztRQUNkLFFBQVEsRUFBRSx3QkFBd0I7UUFDbEMsSUFBSSxFQUFFLFNBQVM7S0FDbEIsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxTQUFTLEVBQUU7UUFDakIsT0FBTyxFQUFFLEtBQUs7UUFDZCxRQUFRLEVBQUUsMkJBQTJCO1FBQ3JDLElBQUksRUFBRSxRQUFRO0tBQ2pCLENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFO1FBQ2YsUUFBUSxFQUFFLG1CQUFtQjtRQUM3QixJQUFJLEVBQUUsUUFBUTtLQUNqQixDQUFDLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRTtRQUNoQixRQUFRLEVBQUUscUJBQXFCO1FBQy9CLElBQUksRUFBRSxRQUFRO0tBQ2pCLENBQUMsQ0FBQyxNQUFNLENBQUMsV0FBVyxFQUFFO1FBQ25CLFFBQVEsRUFBRSw2QkFBNkI7UUFDdkMsSUFBSSxFQUFFLFFBQVE7S0FDakIsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxVQUFVLEVBQUU7UUFDbEIsUUFBUSxFQUFFLDRCQUE0QjtRQUN0QyxJQUFJLEVBQUUsUUFBUTtLQUNqQixDQUFDLENBQUMsTUFBTSxDQUFDLFNBQVMsRUFBRTtRQUNqQixRQUFRLEVBQUUsMkJBQTJCO1FBQ3JDLElBQUksRUFBRSxRQUFRO0tBQ2pCLENBQUMsQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFO1FBQ2pCLFFBQVEsRUFBRSxpQ0FBaUM7UUFDM0MsSUFBSSxFQUFFLFFBQVE7S0FDakIsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxVQUFVLEVBQUU7UUFDbEIsUUFBUSxFQUFFLHNDQUFzQztRQUNoRCxJQUFJLEVBQUUsUUFBUTtRQUNkLE9BQU8sRUFBRSxNQUFNO0tBQ2xCLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQTtBQWpEWSxRQUFBLGNBQWMsa0JBaUQxQjtBQUVELElBQUksT0FBTyxHQUFHLENBQUMsS0FBZSxFQUFFLEVBQUUsQ0FBQyxJQUFBLHNCQUFjLEVBQUMsS0FBSyxDQUFDLENBQUE7QUFFakQsTUFBTSxRQUFRLEdBQUcsQ0FBQyxHQUFhLEVBQUUsRUFBRTtJQUN0QyxPQUFPLEdBQUcsQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLGVBQWUsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLElBQW1CLEVBQUUsRUFBRTtRQUNqRixJQUFBLGVBQVEsR0FBRSxDQUFBO1FBQ1YsTUFBTSxPQUFPLEdBQUcsSUFBQSxlQUFRLEVBQUMsSUFBSSxDQUFhLENBQUE7UUFDMUMsY0FBTSxDQUFDLFdBQVcsQ0FBQztZQUNmLFFBQVEsRUFBRSxPQUFPLENBQUMsUUFBZTtTQUNwQyxDQUFDLENBQUE7UUFDRixjQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLE9BQU8sQ0FBQyxDQUFBO1FBQzNDLE1BQU0sSUFBQSxlQUFNLEVBQUMsT0FBTyxDQUFDLENBQUE7SUFDekIsQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDLENBQUE7QUFWWSxRQUFBLFFBQVEsWUFVcEIifQ== \ No newline at end of file diff --git a/packages/media/commands/svg2jpg.d.ts b/packages/media/commands/svg2jpg.d.ts index 443f33e5..ca73784e 100644 --- a/packages/media/commands/svg2jpg.d.ts +++ b/packages/media/commands/svg2jpg.d.ts @@ -1,2 +1,2 @@ -import * as CLI from 'yargs'; -export declare const register: (cli: CLI.Argv) => CLI.Argv<{}>; +import * as CLI from 'yargs'; +export declare const register: (cli: CLI.Argv) => any; diff --git a/packages/media/commands/svg2jpg.js b/packages/media/commands/svg2jpg.js index 015da15c..595be28b 100644 --- a/packages/media/commands/svg2jpg.js +++ b/packages/media/commands/svg2jpg.js @@ -1,49 +1,49 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.register = void 0; -const debug_1 = require("@plastichub/core/debug"); -const path = require("path"); -const index_1 = require("../lib/process/index"); -const bluebird = require("bluebird"); -const fg = require('fast-glob'); -const defaultOptions = (yargs) => { - return yargs.option('input', { - default: './', - describe: 'The sources' - }).option('debug', { - default: 'false', - describe: 'Enable internal debug message' - }); -}; -let options = (yargs) => defaultOptions(yargs); -async function convertFiles(files) { - return bluebird.mapSeries(files, (file) => { - const inParts = path.parse(file); - const promise = index_1.Helper.run(inParts.dir, 'convert', [ - `"${inParts.base}"`, - '-quality 40', - '-sharpen 0x1.0', - `"${inParts.name}.jpg"` - ]); - return promise; - }); -} -//node ./build/main.js svg2jpg --input=../tests/svg/ -const register = (cli) => { - return cli.command('svg2jpg', '', options, async (argv) => { - if (argv.help) { - return; - } - const src = path.resolve('' + argv.input); - const files = fg.sync('*.svg|*.SVG', { dot: true, cwd: src, absolute: true }); - if (argv.debug) { - (0, debug_1.debug)(`Begin convert SVG files at ${src} ${files}`); - } - await convertFiles(files); - if (argv.debug) { - (0, debug_1.debug)(`Converted ${files.length} files`); - } - }); -}; -exports.register = register; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3ZnMmpwZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9jb21tYW5kcy9zdmcyanBnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLGtEQUE4QztBQUM5Qyw2QkFBNkI7QUFDN0IsZ0RBQThDO0FBQzlDLHFDQUFxQztBQUVyQyxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUM7QUFFaEMsTUFBTSxjQUFjLEdBQUcsQ0FBQyxLQUFlLEVBQUUsRUFBRTtJQUN2QyxPQUFPLEtBQUssQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFO1FBQ3pCLE9BQU8sRUFBRSxJQUFJO1FBQ2IsUUFBUSxFQUFFLGFBQWE7S0FDMUIsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUU7UUFDZixPQUFPLEVBQUUsT0FBTztRQUNoQixRQUFRLEVBQUUsK0JBQStCO0tBQzVDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQztBQUVGLElBQUksT0FBTyxHQUFHLENBQUMsS0FBZSxFQUFFLEVBQUUsQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLENBQUM7QUFFekQsS0FBSyxVQUFVLFlBQVksQ0FBQyxLQUFLO0lBQzdCLE9BQU8sUUFBUSxDQUFDLFNBQVMsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxJQUFZLEVBQUUsRUFBRTtRQUM5QyxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2pDLE1BQU0sT0FBTyxHQUFHLGNBQU0sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxTQUFTLEVBQ2pEO1lBQ0ksSUFBSSxPQUFPLENBQUMsSUFBSSxHQUFHO1lBQ25CLGFBQWE7WUFDYixnQkFBZ0I7WUFDaEIsSUFBSSxPQUFPLENBQUMsSUFBSSxPQUFPO1NBQzFCLENBQUMsQ0FBQztRQUNILE9BQU8sT0FBTyxDQUFDO0lBQ25CLENBQUMsQ0FBQyxDQUFDO0FBQ1AsQ0FBQztBQUNELG9EQUFvRDtBQUU3QyxNQUFNLFFBQVEsR0FBRyxDQUFDLEdBQWEsRUFBRSxFQUFFO0lBQ3RDLE9BQU8sR0FBRyxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsRUFBRSxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsSUFBbUIsRUFBRSxFQUFFO1FBQ3JFLElBQUksSUFBSSxDQUFDLElBQUksRUFBRTtZQUFFLE9BQU87U0FBRTtRQUMxQixNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUUsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDMUMsTUFBTSxLQUFLLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxhQUFhLEVBQUUsRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFDOUUsSUFBSSxJQUFJLENBQUMsS0FBSyxFQUFFO1lBQ1osSUFBQSxhQUFLLEVBQUMsOEJBQThCLEdBQUcsSUFBSSxLQUFLLEVBQUUsQ0FBQyxDQUFDO1NBQ3ZEO1FBQ0QsTUFBTSxZQUFZLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDMUIsSUFBSSxJQUFJLENBQUMsS0FBSyxFQUFFO1lBQ1osSUFBQSxhQUFLLEVBQUMsYUFBYSxLQUFLLENBQUMsTUFBTSxRQUFRLENBQUMsQ0FBQztTQUM1QztJQUNMLENBQUMsQ0FBQyxDQUFDO0FBQ1AsQ0FBQyxDQUFDO0FBYlcsUUFBQSxRQUFRLFlBYW5CIn0= \ No newline at end of file +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.register = void 0; +const debug_1 = require("@plastichub/core/debug"); +const path = require("path"); +const index_1 = require("../lib/process/index"); +const bluebird = require("bluebird"); +const fg = require('fast-glob'); +const defaultOptions = (yargs) => { + return yargs.option('input', { + default: './', + describe: 'The sources' + }).option('debug', { + default: 'false', + describe: 'Enable internal debug message' + }); +}; +let options = (yargs) => defaultOptions(yargs); +async function convertFiles(files) { + return bluebird.mapSeries(files, (file) => { + const inParts = path.parse(file); + const promise = index_1.Helper.run(inParts.dir, 'convert', [ + `"${inParts.base}"`, + '-quality 40', + '-sharpen 0x1.0', + `"${inParts.name}.jpg"` + ]); + return promise; + }); +} +//node ./build/main.js svg2jpg --input=../tests/svg/ +const register = (cli) => { + return cli.command('svg2jpg', '', options, async (argv) => { + if (argv.help) { + return; + } + const src = path.resolve('' + argv.input); + const files = fg.sync('*.svg|*.SVG', { dot: true, cwd: src, absolute: true }); + if (argv.debug) { + (0, debug_1.debug)(`Begin convert SVG files at ${src} ${files}`); + } + await convertFiles(files); + if (argv.debug) { + (0, debug_1.debug)(`Converted ${files.length} files`); + } + }); +}; +exports.register = register; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3ZnMmpwZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9jb21tYW5kcy9zdmcyanBnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLGtEQUE4QztBQUM5Qyw2QkFBNkI7QUFDN0IsZ0RBQThDO0FBQzlDLHFDQUFxQztBQUVyQyxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUM7QUFFaEMsTUFBTSxjQUFjLEdBQUcsQ0FBQyxLQUFlLEVBQUUsRUFBRTtJQUN2QyxPQUFPLEtBQUssQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFO1FBQ3pCLE9BQU8sRUFBRSxJQUFJO1FBQ2IsUUFBUSxFQUFFLGFBQWE7S0FDMUIsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUU7UUFDZixPQUFPLEVBQUUsT0FBTztRQUNoQixRQUFRLEVBQUUsK0JBQStCO0tBQzVDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQztBQUVGLElBQUksT0FBTyxHQUFHLENBQUMsS0FBZSxFQUFFLEVBQUUsQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLENBQUM7QUFFekQsS0FBSyxVQUFVLFlBQVksQ0FBQyxLQUFLO0lBQzdCLE9BQU8sUUFBUSxDQUFDLFNBQVMsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxJQUFZLEVBQUUsRUFBRTtRQUM5QyxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2pDLE1BQU0sT0FBTyxHQUFHLGNBQU0sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxTQUFTLEVBQ2pEO1lBQ0ksSUFBSSxPQUFPLENBQUMsSUFBSSxHQUFHO1lBQ25CLGFBQWE7WUFDYixnQkFBZ0I7WUFDaEIsSUFBSSxPQUFPLENBQUMsSUFBSSxPQUFPO1NBQzFCLENBQUMsQ0FBQztRQUNILE9BQU8sT0FBTyxDQUFDO0lBQ25CLENBQUMsQ0FBQyxDQUFDO0FBQ1AsQ0FBQztBQUNELG9EQUFvRDtBQUU3QyxNQUFNLFFBQVEsR0FBRyxDQUFDLEdBQWEsRUFBRSxFQUFFO0lBQ3RDLE9BQU8sR0FBRyxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsRUFBRSxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsSUFBbUIsRUFBRSxFQUFFO1FBQ3JFLElBQUksSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO1lBQUMsT0FBTztRQUFDLENBQUM7UUFDMUIsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzFDLE1BQU0sS0FBSyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsYUFBYSxFQUFFLEVBQUUsR0FBRyxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQzlFLElBQUksSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ2IsSUFBQSxhQUFLLEVBQUMsOEJBQThCLEdBQUcsSUFBSSxLQUFLLEVBQUUsQ0FBQyxDQUFDO1FBQ3hELENBQUM7UUFDRCxNQUFNLFlBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUMxQixJQUFJLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUNiLElBQUEsYUFBSyxFQUFDLGFBQWEsS0FBSyxDQUFDLE1BQU0sUUFBUSxDQUFDLENBQUM7UUFDN0MsQ0FBQztJQUNMLENBQUMsQ0FBQyxDQUFDO0FBQ1AsQ0FBQyxDQUFDO0FBYlcsUUFBQSxRQUFRLFlBYW5CIn0= \ No newline at end of file diff --git a/packages/media/commands/video.d.ts b/packages/media/commands/video.d.ts index 1cc7da26..3298fb71 100644 --- a/packages/media/commands/video.d.ts +++ b/packages/media/commands/video.d.ts @@ -1,11 +1,3 @@ -import * as CLI from 'yargs'; -export declare const defaultOptions: (yargs: CLI.Argv) => CLI.Argv<{ - src: unknown; -} & { - dst: unknown; -} & { - debug: boolean; -} & { - alt: boolean; -}>; -export declare const register: (cli: CLI.Argv) => CLI.Argv<{}>; +import * as CLI from 'yargs'; +export declare const defaultOptions: (yargs: CLI.Argv) => any; +export declare const register: (cli: CLI.Argv) => any; diff --git a/packages/media/commands/video.js b/packages/media/commands/video.js index 3113cfdc..2ccd466e 100644 --- a/packages/media/commands/video.js +++ b/packages/media/commands/video.js @@ -1,39 +1,39 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.register = exports.defaultOptions = void 0; -const __1 = require("../"); -const video_1 = require("../lib/media/video"); -const _cli_1 = require("../_cli"); -const defaultOptions = (yargs) => { - return yargs.option('src', { - describe: 'FILE|FOLDER|GLOB', - demandOption: true - }).option('dst', { - describe: 'FILE|FOLDER|GLOB' - }).option('debug', { - default: false, - describe: 'Enable internal debug messages', - type: 'boolean' - }).option('alt', { - default: false, - describe: 'Use alternate tokenizer, & instead of $', - type: 'boolean' - }); -}; -exports.defaultOptions = defaultOptions; -let options = (yargs) => (0, exports.defaultOptions)(yargs); -const register = (cli) => { - return cli.command('video ', 'Convert video', options, async (argv) => { - (0, _cli_1.defaults)(); - const options = (0, _cli_1.sanitizeVideo)(argv); - __1.logger.info("options " + argv.dst, options); - if (options.verb == 'convert') { - return (0, video_1.convert)(options); - } - if (options.verb == 'merge') { - return (0, video_1.merge)(options); - } - }); -}; -exports.register = register; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmlkZW8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29tbWFuZHMvdmlkZW8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsMkJBQTRCO0FBQzVCLDhDQUFtRDtBQUNuRCxrQ0FBaUQ7QUFHMUMsTUFBTSxjQUFjLEdBQUcsQ0FBQyxLQUFlLEVBQUUsRUFBRTtJQUM5QyxPQUFPLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFO1FBQ3ZCLFFBQVEsRUFBRSxrQkFBa0I7UUFDNUIsWUFBWSxFQUFFLElBQUk7S0FDckIsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUU7UUFDYixRQUFRLEVBQUUsa0JBQWtCO0tBQy9CLENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFO1FBQ2YsT0FBTyxFQUFFLEtBQUs7UUFDZCxRQUFRLEVBQUUsZ0NBQWdDO1FBQzFDLElBQUksRUFBRSxTQUFTO0tBQ2xCLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFO1FBQ2IsT0FBTyxFQUFFLEtBQUs7UUFDZCxRQUFRLEVBQUUseUNBQXlDO1FBQ25ELElBQUksRUFBRSxTQUFTO0tBQ2xCLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQTtBQWZZLFFBQUEsY0FBYyxrQkFlMUI7QUFFRCxJQUFJLE9BQU8sR0FBRyxDQUFDLEtBQWUsRUFBRSxFQUFFLENBQUMsSUFBQSxzQkFBYyxFQUFDLEtBQUssQ0FBQyxDQUFBO0FBRWpELE1BQU0sUUFBUSxHQUFHLENBQUMsR0FBYSxFQUFFLEVBQUU7SUFDdEMsT0FBTyxHQUFHLENBQUMsT0FBTyxDQUFDLGNBQWMsRUFBRSxlQUFlLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxJQUFtQixFQUFFLEVBQUU7UUFDdkYsSUFBQSxlQUFRLEdBQUUsQ0FBQTtRQUNWLE1BQU0sT0FBTyxHQUFHLElBQUEsb0JBQWEsRUFBQyxJQUFJLENBQXlCLENBQUE7UUFDM0QsVUFBTSxDQUFDLElBQUksQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsQ0FBQTtRQUMzQyxJQUFJLE9BQU8sQ0FBQyxJQUFJLElBQUksU0FBUyxFQUFFO1lBQzNCLE9BQU8sSUFBQSxlQUFPLEVBQUMsT0FBTyxDQUFDLENBQUE7U0FDMUI7UUFDRCxJQUFJLE9BQU8sQ0FBQyxJQUFJLElBQUksT0FBTyxFQUFFO1lBQ3pCLE9BQU8sSUFBQSxhQUFLLEVBQUMsT0FBTyxDQUFRLENBQUE7U0FDL0I7SUFDTCxDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQTtBQVpZLFFBQUEsUUFBUSxZQVlwQiJ9 \ No newline at end of file +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.register = exports.defaultOptions = void 0; +const __1 = require("../"); +const video_1 = require("../lib/media/video"); +const _cli_1 = require("../_cli"); +const defaultOptions = (yargs) => { + return yargs.option('src', { + describe: 'FILE|FOLDER|GLOB', + demandOption: true + }).option('dst', { + describe: 'FILE|FOLDER|GLOB' + }).option('debug', { + default: false, + describe: 'Enable internal debug messages', + type: 'boolean' + }).option('alt', { + default: false, + describe: 'Use alternate tokenizer, & instead of $', + type: 'boolean' + }); +}; +exports.defaultOptions = defaultOptions; +let options = (yargs) => (0, exports.defaultOptions)(yargs); +const register = (cli) => { + return cli.command('video ', 'Convert video', options, async (argv) => { + (0, _cli_1.defaults)(); + const options = (0, _cli_1.sanitizeVideo)(argv); + __1.logger.info("options " + argv.dst, options); + if (options.verb == 'convert') { + return (0, video_1.convert)(options); + } + if (options.verb == 'merge') { + return (0, video_1.merge)(options); + } + }); +}; +exports.register = register; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmlkZW8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29tbWFuZHMvdmlkZW8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsMkJBQTRCO0FBQzVCLDhDQUFtRDtBQUNuRCxrQ0FBaUQ7QUFHMUMsTUFBTSxjQUFjLEdBQUcsQ0FBQyxLQUFlLEVBQUUsRUFBRTtJQUM5QyxPQUFPLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFO1FBQ3ZCLFFBQVEsRUFBRSxrQkFBa0I7UUFDNUIsWUFBWSxFQUFFLElBQUk7S0FDckIsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUU7UUFDYixRQUFRLEVBQUUsa0JBQWtCO0tBQy9CLENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFO1FBQ2YsT0FBTyxFQUFFLEtBQUs7UUFDZCxRQUFRLEVBQUUsZ0NBQWdDO1FBQzFDLElBQUksRUFBRSxTQUFTO0tBQ2xCLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFO1FBQ2IsT0FBTyxFQUFFLEtBQUs7UUFDZCxRQUFRLEVBQUUseUNBQXlDO1FBQ25ELElBQUksRUFBRSxTQUFTO0tBQ2xCLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQTtBQWZZLFFBQUEsY0FBYyxrQkFlMUI7QUFFRCxJQUFJLE9BQU8sR0FBRyxDQUFDLEtBQWUsRUFBRSxFQUFFLENBQUMsSUFBQSxzQkFBYyxFQUFDLEtBQUssQ0FBQyxDQUFBO0FBRWpELE1BQU0sUUFBUSxHQUFHLENBQUMsR0FBYSxFQUFFLEVBQUU7SUFDdEMsT0FBTyxHQUFHLENBQUMsT0FBTyxDQUFDLGNBQWMsRUFBRSxlQUFlLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxJQUFtQixFQUFFLEVBQUU7UUFDdkYsSUFBQSxlQUFRLEdBQUUsQ0FBQTtRQUNWLE1BQU0sT0FBTyxHQUFHLElBQUEsb0JBQWEsRUFBQyxJQUFJLENBQXlCLENBQUE7UUFDM0QsVUFBTSxDQUFDLElBQUksQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsQ0FBQTtRQUMzQyxJQUFJLE9BQU8sQ0FBQyxJQUFJLElBQUksU0FBUyxFQUFFLENBQUM7WUFDNUIsT0FBTyxJQUFBLGVBQU8sRUFBQyxPQUFPLENBQUMsQ0FBQTtRQUMzQixDQUFDO1FBQ0QsSUFBSSxPQUFPLENBQUMsSUFBSSxJQUFJLE9BQU8sRUFBRSxDQUFDO1lBQzFCLE9BQU8sSUFBQSxhQUFLLEVBQUMsT0FBTyxDQUFRLENBQUE7UUFDaEMsQ0FBQztJQUNMLENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFBO0FBWlksUUFBQSxRQUFRLFlBWXBCIn0= \ No newline at end of file diff --git a/packages/media/commands/watermark.d.ts b/packages/media/commands/watermark.d.ts index dac15219..3298fb71 100644 --- a/packages/media/commands/watermark.d.ts +++ b/packages/media/commands/watermark.d.ts @@ -1,31 +1,3 @@ -import * as CLI from 'yargs'; -export declare const defaultOptions: (yargs: CLI.Argv) => CLI.Argv & { - percent: number; -} & { - key: string; -}>; -export declare const register: (cli: CLI.Argv) => CLI.Argv<{}>; +import * as CLI from 'yargs'; +export declare const defaultOptions: (yargs: CLI.Argv) => any; +export declare const register: (cli: CLI.Argv) => any; diff --git a/packages/media/commands/watermark.js b/packages/media/commands/watermark.js index 18652208..40b0ad2a 100644 --- a/packages/media/commands/watermark.js +++ b/packages/media/commands/watermark.js @@ -1,75 +1,75 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.register = exports.defaultOptions = void 0; -const osr_commons_1 = require("@plastichub/osr-commons"); -const index_1 = require("../index"); -const images_1 = require("../lib/media/images"); -const _cli_1 = require("../_cli"); -const defaultOptions = (yargs) => { - return yargs.option('src', { - describe: 'FILE|FOLDER|GLOB', - demandOption: true - }).option('dst', { - describe: 'FILE|FOLDER|GLOB' - }).option('debug', { - default: false, - describe: 'Enable internal debug messages', - type: 'boolean' - }).option('alt', { - default: false, - describe: 'Use alternate tokenizer, & instead of $', - type: 'boolean' - }).option('dry', { - default: false, - describe: 'Run without conversion', - type: 'boolean' - }).option('verbose', { - default: false, - describe: 'Show internal messages', - type: 'boolean' - }).option('percent', { - default: false, - describe: 'Resize image with percent', - type: 'number' - }).option('width', { - default: false, - describe: 'Resize image with', - type: 'number' - }).option('height', { - default: false, - describe: 'Resize image height', - type: 'number' - }).option('minHeight', { - describe: 'Resize image minimum height', - type: 'number' - }).option('minWidth', { - describe: 'Resize image minimum width', - type: 'number' - }).option('minSize', { - describe: 'Resize image size (bytes)', - type: 'number' - }).option('percent', { - describe: 'Resize image in percent (width)', - type: 'number' - }).option('key', { - describe: 'API Key', - type: 'string' - }); -}; -exports.defaultOptions = defaultOptions; -const options = (yargs) => (0, exports.defaultOptions)(yargs); -const register = (cli) => { - return cli.command('watermark', 'Remove watermark : FILE|GLOB', options, async (argv) => { - (0, _cli_1.defaults)(); - const options = (0, _cli_1.sanitize)(argv); - const config = (0, osr_commons_1.CONFIG_DEFAULT)(); - if (!config.novita) { - index_1.logger.error("Novita key not found"); - return; - } - options.debug && index_1.logger.info("Watermark Options " + argv.dst, options); - return (0, images_1.watermark)({ ...options, key: config.novita.key }); - }); -}; -exports.register = register; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2F0ZXJtYXJrLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbW1hbmRzL3dhdGVybWFyay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSx5REFBd0Q7QUFFeEQsb0NBQWlDO0FBQ2pDLGdEQUU0QjtBQUU1QixrQ0FHZ0I7QUFNVCxNQUFNLGNBQWMsR0FBRyxDQUFDLEtBQWUsRUFBRSxFQUFFO0lBQ2hELE9BQU8sS0FBSyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUU7UUFDekIsUUFBUSxFQUFFLGtCQUFrQjtRQUM1QixZQUFZLEVBQUUsSUFBSTtLQUNuQixDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRTtRQUNmLFFBQVEsRUFBRSxrQkFBa0I7S0FDN0IsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUU7UUFDakIsT0FBTyxFQUFFLEtBQUs7UUFDZCxRQUFRLEVBQUUsZ0NBQWdDO1FBQzFDLElBQUksRUFBRSxTQUFTO0tBQ2hCLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFO1FBQ2YsT0FBTyxFQUFFLEtBQUs7UUFDZCxRQUFRLEVBQUUseUNBQXlDO1FBQ25ELElBQUksRUFBRSxTQUFTO0tBQ2hCLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFO1FBQ2YsT0FBTyxFQUFFLEtBQUs7UUFDZCxRQUFRLEVBQUUsd0JBQXdCO1FBQ2xDLElBQUksRUFBRSxTQUFTO0tBQ2hCLENBQUMsQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFO1FBQ25CLE9BQU8sRUFBRSxLQUFLO1FBQ2QsUUFBUSxFQUFFLHdCQUF3QjtRQUNsQyxJQUFJLEVBQUUsU0FBUztLQUNoQixDQUFDLENBQUMsTUFBTSxDQUFDLFNBQVMsRUFBRTtRQUNuQixPQUFPLEVBQUUsS0FBSztRQUNkLFFBQVEsRUFBRSwyQkFBMkI7UUFDckMsSUFBSSxFQUFFLFFBQVE7S0FDZixDQUFDLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRTtRQUNqQixPQUFPLEVBQUUsS0FBSztRQUNkLFFBQVEsRUFBRSxtQkFBbUI7UUFDN0IsSUFBSSxFQUFFLFFBQVE7S0FDZixDQUFDLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRTtRQUNsQixPQUFPLEVBQUUsS0FBSztRQUNkLFFBQVEsRUFBRSxxQkFBcUI7UUFDL0IsSUFBSSxFQUFFLFFBQVE7S0FDZixDQUFDLENBQUMsTUFBTSxDQUFDLFdBQVcsRUFBRTtRQUNyQixRQUFRLEVBQUUsNkJBQTZCO1FBQ3ZDLElBQUksRUFBRSxRQUFRO0tBQ2YsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxVQUFVLEVBQUU7UUFDcEIsUUFBUSxFQUFFLDRCQUE0QjtRQUN0QyxJQUFJLEVBQUUsUUFBUTtLQUNmLENBQUMsQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFO1FBQ25CLFFBQVEsRUFBRSwyQkFBMkI7UUFDckMsSUFBSSxFQUFFLFFBQVE7S0FDZixDQUFDLENBQUMsTUFBTSxDQUFDLFNBQVMsRUFBRTtRQUNuQixRQUFRLEVBQUUsaUNBQWlDO1FBQzNDLElBQUksRUFBRSxRQUFRO0tBQ2YsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUU7UUFDZixRQUFRLEVBQUUsU0FBUztRQUNuQixJQUFJLEVBQUUsUUFBUTtLQUNmLENBQUMsQ0FBQTtBQUNKLENBQUMsQ0FBQTtBQWxEWSxRQUFBLGNBQWMsa0JBa0QxQjtBQUVELE1BQU0sT0FBTyxHQUFHLENBQUMsS0FBZSxFQUFFLEVBQUUsQ0FBQyxJQUFBLHNCQUFjLEVBQUMsS0FBSyxDQUFDLENBQUE7QUFFbkQsTUFBTSxRQUFRLEdBQUcsQ0FBQyxHQUFhLEVBQUUsRUFBRTtJQUN4QyxPQUFPLEdBQUcsQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLDhCQUE4QixFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsSUFBbUIsRUFBRSxFQUFFO1FBQ3JHLElBQUEsZUFBUSxHQUFFLENBQUE7UUFDVixNQUFNLE9BQU8sR0FBRyxJQUFBLGVBQVEsRUFBQyxJQUFJLENBQWEsQ0FBQTtRQUMxQyxNQUFNLE1BQU0sR0FBUSxJQUFBLDRCQUFjLEdBQUUsQ0FBQTtRQUNwQyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRTtZQUNsQixjQUFNLENBQUMsS0FBSyxDQUFDLHNCQUFzQixDQUFDLENBQUM7WUFDckMsT0FBTTtTQUNQO1FBQ0QsT0FBTyxDQUFDLEtBQUssSUFBSSxjQUFNLENBQUMsSUFBSSxDQUFDLG9CQUFvQixHQUFHLElBQUksQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDLENBQUE7UUFDdEUsT0FBTyxJQUFBLGtCQUFTLEVBQUMsRUFBRSxHQUFHLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFBO0lBQzFELENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyxDQUFBO0FBWlksUUFBQSxRQUFRLFlBWXBCIn0= \ No newline at end of file +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.register = exports.defaultOptions = void 0; +const osr_commons_1 = require("@plastichub/osr-commons"); +const index_1 = require("../index"); +const images_1 = require("../lib/media/images"); +const _cli_1 = require("../_cli"); +const defaultOptions = (yargs) => { + return yargs.option('src', { + describe: 'FILE|FOLDER|GLOB', + demandOption: true + }).option('dst', { + describe: 'FILE|FOLDER|GLOB' + }).option('debug', { + default: false, + describe: 'Enable internal debug messages', + type: 'boolean' + }).option('alt', { + default: false, + describe: 'Use alternate tokenizer, & instead of $', + type: 'boolean' + }).option('dry', { + default: false, + describe: 'Run without conversion', + type: 'boolean' + }).option('verbose', { + default: false, + describe: 'Show internal messages', + type: 'boolean' + }).option('percent', { + default: false, + describe: 'Resize image with percent', + type: 'number' + }).option('width', { + default: false, + describe: 'Resize image with', + type: 'number' + }).option('height', { + default: false, + describe: 'Resize image height', + type: 'number' + }).option('minHeight', { + describe: 'Resize image minimum height', + type: 'number' + }).option('minWidth', { + describe: 'Resize image minimum width', + type: 'number' + }).option('minSize', { + describe: 'Resize image size (bytes)', + type: 'number' + }).option('percent', { + describe: 'Resize image in percent (width)', + type: 'number' + }).option('key', { + describe: 'API Key', + type: 'string' + }); +}; +exports.defaultOptions = defaultOptions; +const options = (yargs) => (0, exports.defaultOptions)(yargs); +const register = (cli) => { + return cli.command('watermark', 'Remove watermark : FILE|GLOB', options, async (argv) => { + (0, _cli_1.defaults)(); + const options = (0, _cli_1.sanitize)(argv); + const config = (0, osr_commons_1.CONFIG_DEFAULT)(); + if (!config.novita) { + index_1.logger.error("Novita key not found"); + return; + } + options.debug && index_1.logger.info("Watermark Options " + argv.dst, options); + return (0, images_1.watermark)({ ...options, key: config.novita.key }); + }); +}; +exports.register = register; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2F0ZXJtYXJrLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbW1hbmRzL3dhdGVybWFyay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSx5REFBd0Q7QUFFeEQsb0NBQWlDO0FBQ2pDLGdEQUU0QjtBQUU1QixrQ0FHZ0I7QUFNVCxNQUFNLGNBQWMsR0FBRyxDQUFDLEtBQWUsRUFBRSxFQUFFO0lBQ2hELE9BQU8sS0FBSyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUU7UUFDekIsUUFBUSxFQUFFLGtCQUFrQjtRQUM1QixZQUFZLEVBQUUsSUFBSTtLQUNuQixDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRTtRQUNmLFFBQVEsRUFBRSxrQkFBa0I7S0FDN0IsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUU7UUFDakIsT0FBTyxFQUFFLEtBQUs7UUFDZCxRQUFRLEVBQUUsZ0NBQWdDO1FBQzFDLElBQUksRUFBRSxTQUFTO0tBQ2hCLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFO1FBQ2YsT0FBTyxFQUFFLEtBQUs7UUFDZCxRQUFRLEVBQUUseUNBQXlDO1FBQ25ELElBQUksRUFBRSxTQUFTO0tBQ2hCLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFO1FBQ2YsT0FBTyxFQUFFLEtBQUs7UUFDZCxRQUFRLEVBQUUsd0JBQXdCO1FBQ2xDLElBQUksRUFBRSxTQUFTO0tBQ2hCLENBQUMsQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFO1FBQ25CLE9BQU8sRUFBRSxLQUFLO1FBQ2QsUUFBUSxFQUFFLHdCQUF3QjtRQUNsQyxJQUFJLEVBQUUsU0FBUztLQUNoQixDQUFDLENBQUMsTUFBTSxDQUFDLFNBQVMsRUFBRTtRQUNuQixPQUFPLEVBQUUsS0FBSztRQUNkLFFBQVEsRUFBRSwyQkFBMkI7UUFDckMsSUFBSSxFQUFFLFFBQVE7S0FDZixDQUFDLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRTtRQUNqQixPQUFPLEVBQUUsS0FBSztRQUNkLFFBQVEsRUFBRSxtQkFBbUI7UUFDN0IsSUFBSSxFQUFFLFFBQVE7S0FDZixDQUFDLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRTtRQUNsQixPQUFPLEVBQUUsS0FBSztRQUNkLFFBQVEsRUFBRSxxQkFBcUI7UUFDL0IsSUFBSSxFQUFFLFFBQVE7S0FDZixDQUFDLENBQUMsTUFBTSxDQUFDLFdBQVcsRUFBRTtRQUNyQixRQUFRLEVBQUUsNkJBQTZCO1FBQ3ZDLElBQUksRUFBRSxRQUFRO0tBQ2YsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxVQUFVLEVBQUU7UUFDcEIsUUFBUSxFQUFFLDRCQUE0QjtRQUN0QyxJQUFJLEVBQUUsUUFBUTtLQUNmLENBQUMsQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFO1FBQ25CLFFBQVEsRUFBRSwyQkFBMkI7UUFDckMsSUFBSSxFQUFFLFFBQVE7S0FDZixDQUFDLENBQUMsTUFBTSxDQUFDLFNBQVMsRUFBRTtRQUNuQixRQUFRLEVBQUUsaUNBQWlDO1FBQzNDLElBQUksRUFBRSxRQUFRO0tBQ2YsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUU7UUFDZixRQUFRLEVBQUUsU0FBUztRQUNuQixJQUFJLEVBQUUsUUFBUTtLQUNmLENBQUMsQ0FBQTtBQUNKLENBQUMsQ0FBQTtBQWxEWSxRQUFBLGNBQWMsa0JBa0QxQjtBQUVELE1BQU0sT0FBTyxHQUFHLENBQUMsS0FBZSxFQUFFLEVBQUUsQ0FBQyxJQUFBLHNCQUFjLEVBQUMsS0FBSyxDQUFDLENBQUE7QUFFbkQsTUFBTSxRQUFRLEdBQUcsQ0FBQyxHQUFhLEVBQUUsRUFBRTtJQUN4QyxPQUFPLEdBQUcsQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLDhCQUE4QixFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsSUFBbUIsRUFBRSxFQUFFO1FBQ3JHLElBQUEsZUFBUSxHQUFFLENBQUE7UUFDVixNQUFNLE9BQU8sR0FBRyxJQUFBLGVBQVEsRUFBQyxJQUFJLENBQWEsQ0FBQTtRQUMxQyxNQUFNLE1BQU0sR0FBUSxJQUFBLDRCQUFjLEdBQUUsQ0FBQTtRQUNwQyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ25CLGNBQU0sQ0FBQyxLQUFLLENBQUMsc0JBQXNCLENBQUMsQ0FBQztZQUNyQyxPQUFNO1FBQ1IsQ0FBQztRQUNELE9BQU8sQ0FBQyxLQUFLLElBQUksY0FBTSxDQUFDLElBQUksQ0FBQyxvQkFBb0IsR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLE9BQU8sQ0FBQyxDQUFBO1FBQ3RFLE9BQU8sSUFBQSxrQkFBUyxFQUFDLEVBQUUsR0FBRyxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQTtJQUMxRCxDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUMsQ0FBQTtBQVpZLFFBQUEsUUFBUSxZQVlwQiJ9 \ No newline at end of file diff --git a/packages/media/constants.d.ts b/packages/media/constants.d.ts index ce56ff74..a15bfb1a 100644 --- a/packages/media/constants.d.ts +++ b/packages/media/constants.d.ts @@ -1,5 +1,5 @@ -export declare const GIT_REPO = "https://git.osr-plastic.org/osr-plastic/"; -export declare const MODULE_NAME = "OSR-MEDIA"; -export declare const PACKAGE_NAME = "osr-media"; -export declare const ERR_PERM_RETRY_DELAY = 500; -export declare const ERR_PERM_RETRY_MAX = 5; +export declare const GIT_REPO = "https://git.osr-plastic.org/osr-plastic/"; +export declare const MODULE_NAME = "OSR-MEDIA"; +export declare const PACKAGE_NAME = "osr-media"; +export declare const ERR_PERM_RETRY_DELAY = 500; +export declare const ERR_PERM_RETRY_MAX = 5; diff --git a/packages/media/constants.js b/packages/media/constants.js index 12f14a79..321333c8 100644 --- a/packages/media/constants.js +++ b/packages/media/constants.js @@ -1,9 +1,9 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.ERR_PERM_RETRY_MAX = exports.ERR_PERM_RETRY_DELAY = exports.PACKAGE_NAME = exports.MODULE_NAME = exports.GIT_REPO = void 0; -exports.GIT_REPO = 'https://git.osr-plastic.org/osr-plastic/'; -exports.MODULE_NAME = `OSR-MEDIA`; -exports.PACKAGE_NAME = 'osr-media'; -exports.ERR_PERM_RETRY_DELAY = 500; -exports.ERR_PERM_RETRY_MAX = 5; +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.ERR_PERM_RETRY_MAX = exports.ERR_PERM_RETRY_DELAY = exports.PACKAGE_NAME = exports.MODULE_NAME = exports.GIT_REPO = void 0; +exports.GIT_REPO = 'https://git.osr-plastic.org/osr-plastic/'; +exports.MODULE_NAME = `OSR-MEDIA`; +exports.PACKAGE_NAME = 'osr-media'; +exports.ERR_PERM_RETRY_DELAY = 500; +exports.ERR_PERM_RETRY_MAX = 5; //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsic3JjL2NvbnN0YW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBYSxRQUFBLFFBQVEsR0FBRywwQ0FBMEMsQ0FBQTtBQUNyRCxRQUFBLFdBQVcsR0FBRyxXQUFXLENBQUM7QUFDMUIsUUFBQSxZQUFZLEdBQUcsV0FBVyxDQUFDO0FBRTNCLFFBQUEsb0JBQW9CLEdBQUcsR0FBRyxDQUFBO0FBQzFCLFFBQUEsa0JBQWtCLEdBQUcsQ0FBQyxDQUFBIn0= \ No newline at end of file diff --git a/packages/media/index.d.ts b/packages/media/index.d.ts index b6cca8e0..3ac40915 100644 --- a/packages/media/index.d.ts +++ b/packages/media/index.d.ts @@ -1,5 +1,5 @@ -export * from './constants'; -export * from './types'; -export declare const logger: import("@plastichub/core/debug").Logger; -import { IObjectLiteral } from "@plastichub/core"; -export declare const substitute: (alt: boolean, template: string, vars: IObjectLiteral) => any; +export * from './constants'; +export * from './types'; +export declare const logger: any; +import { IObjectLiteral } from "@plastichub/core"; +export declare const substitute: (alt: boolean, template: string, vars: IObjectLiteral) => any; diff --git a/packages/media/index.js b/packages/media/index.js index 211ea658..cc3bad28 100644 --- a/packages/media/index.js +++ b/packages/media/index.js @@ -1,26 +1,26 @@ -"use strict"; -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - var desc = Object.getOwnPropertyDescriptor(m, k); - if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { - desc = { enumerable: true, get: function() { return m[k]; } }; - } - Object.defineProperty(o, k2, desc); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __exportStar = (this && this.__exportStar) || function(m, exports) { - for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p); -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.substitute = exports.logger = void 0; -__exportStar(require("./constants"), exports); -__exportStar(require("./types"), exports); -const debug_1 = require("@plastichub/core/debug"); -const constants_1 = require("./constants"); -exports.logger = (0, debug_1.logger)(constants_1.MODULE_NAME); -const strings_1 = require("@plastichub/core/strings"); -const substitute = (alt, template, vars) => alt ? (0, strings_1.substituteAlt)(template, vars) : (0, strings_1.substitute)(template, vars); -exports.substitute = substitute; +"use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __exportStar = (this && this.__exportStar) || function(m, exports) { + for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.substitute = exports.logger = void 0; +__exportStar(require("./constants"), exports); +__exportStar(require("./types"), exports); +const debug_1 = require("@plastichub/core/debug"); +const constants_1 = require("./constants"); +exports.logger = (0, debug_1.logger)(constants_1.MODULE_NAME); +const strings_1 = require("@plastichub/core/strings"); +const substitute = (alt, template, vars) => alt ? (0, strings_1.substituteAlt)(template, vars) : (0, strings_1.substitute)(template, vars); +exports.substitute = substitute; //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJzcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw4Q0FBMkI7QUFDM0IsMENBQXVCO0FBQ3ZCLGtEQUEwRDtBQUUxRCwyQ0FBeUM7QUFDNUIsUUFBQSxNQUFNLEdBQUcsSUFBQSxjQUFPLEVBQUMsdUJBQVcsQ0FBQyxDQUFBO0FBRTFDLHNEQUFxRztBQUc5RixNQUFNLFVBQVUsR0FBRyxDQUFDLEdBQVksRUFBRSxRQUFnQixFQUFFLElBQW9CLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsSUFBQSx1QkFBYyxFQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBQSxvQkFBVyxFQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQTtBQUF6SSxRQUFBLFVBQVUsY0FBK0gifQ== \ No newline at end of file diff --git a/packages/media/lib/common/platform.d.ts b/packages/media/lib/common/platform.d.ts index 10c7cfd0..7a57a206 100644 --- a/packages/media/lib/common/platform.d.ts +++ b/packages/media/lib/common/platform.d.ts @@ -1 +1 @@ -export declare const os: () => "linux" | "windows" | "osx" | "arm"; +export declare const os: () => "windows" | "osx" | "arm" | "linux"; diff --git a/packages/media/lib/common/platform.js b/packages/media/lib/common/platform.js index e4124560..7a763171 100644 --- a/packages/media/lib/common/platform.js +++ b/packages/media/lib/common/platform.js @@ -1,18 +1,18 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.os = void 0; -const os_1 = require("os"); -const os = () => { - if ((0, os_1.platform)() === 'win32') { - return 'windows'; - } - else if ((0, os_1.platform)() === 'darwin') { - return 'osx'; - } - else if ((0, os_1.arch)() === 'arm') { - return 'arm'; - } - return 'linux'; -}; -exports.os = os; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhdGZvcm0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL2NvbW1vbi9wbGF0Zm9ybS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwyQkFBb0M7QUFFN0IsTUFBTSxFQUFFLEdBQUcsR0FBRyxFQUFFO0lBQ3JCLElBQUksSUFBQSxhQUFRLEdBQUUsS0FBSyxPQUFPLEVBQUU7UUFDMUIsT0FBTyxTQUFTLENBQUM7S0FDbEI7U0FBTSxJQUFJLElBQUEsYUFBUSxHQUFFLEtBQUssUUFBUSxFQUFFO1FBQ2xDLE9BQU8sS0FBSyxDQUFDO0tBQ2Q7U0FBTSxJQUFJLElBQUEsU0FBSSxHQUFFLEtBQUssS0FBSyxFQUFFO1FBQzNCLE9BQU8sS0FBSyxDQUFDO0tBQ2Q7SUFDRCxPQUFPLE9BQU8sQ0FBQztBQUNqQixDQUFDLENBQUE7QUFUWSxRQUFBLEVBQUUsTUFTZCJ9 \ No newline at end of file +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.os = void 0; +const os_1 = require("os"); +const os = () => { + if ((0, os_1.platform)() === 'win32') { + return 'windows'; + } + else if ((0, os_1.platform)() === 'darwin') { + return 'osx'; + } + else if ((0, os_1.arch)() === 'arm') { + return 'arm'; + } + return 'linux'; +}; +exports.os = os; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhdGZvcm0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL2NvbW1vbi9wbGF0Zm9ybS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwyQkFBb0M7QUFFN0IsTUFBTSxFQUFFLEdBQUcsR0FBRyxFQUFFO0lBQ3JCLElBQUksSUFBQSxhQUFRLEdBQUUsS0FBSyxPQUFPLEVBQUUsQ0FBQztRQUMzQixPQUFPLFNBQVMsQ0FBQztJQUNuQixDQUFDO1NBQU0sSUFBSSxJQUFBLGFBQVEsR0FBRSxLQUFLLFFBQVEsRUFBRSxDQUFDO1FBQ25DLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztTQUFNLElBQUksSUFBQSxTQUFJLEdBQUUsS0FBSyxLQUFLLEVBQUUsQ0FBQztRQUM1QixPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7SUFDRCxPQUFPLE9BQU8sQ0FBQztBQUNqQixDQUFDLENBQUE7QUFUWSxRQUFBLEVBQUUsTUFTZCJ9 \ No newline at end of file diff --git a/packages/media/lib/index.d.ts b/packages/media/lib/index.d.ts index f60c4a31..08ce51d9 100644 --- a/packages/media/lib/index.d.ts +++ b/packages/media/lib/index.d.ts @@ -1,5 +1,4 @@ -/// -import { IResizeOptions } from '../types'; -export declare const fileAsBuffer: (path: string) => Buffer; -export declare const targets: (f: string, options: IResizeOptions) => string[]; -export declare const targetsNext: (f: string, options: IResizeOptions) => string[]; +import { IResizeOptions } from '../types'; +export declare const fileAsBuffer: (path: string) => any; +export declare const targets: (f: string, options: IResizeOptions) => string[]; +export declare const targetsNext: (f: string, options: IResizeOptions) => string[]; diff --git a/packages/media/lib/index.js b/packages/media/lib/index.js index 494b87ee..2e2c0ec1 100644 --- a/packages/media/lib/index.js +++ b/packages/media/lib/index.js @@ -1,140 +1,140 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.targetsNext = exports.targets = exports.fileAsBuffer = void 0; -const path = require("path"); -const exists_1 = require("@plastichub/fs/exists"); -const read_1 = require("@plastichub/fs/read"); -const osr_commons_1 = require("@plastichub/osr-commons"); -const osr_commons_2 = require("@plastichub/osr-commons"); -const fileAsBuffer = (path) => (0, read_1.sync)(path, 'buffer') || Buffer.from("-"); -exports.fileAsBuffer = fileAsBuffer; -const clone = (obj) => { - if (null == obj || "object" != typeof obj) - return obj; - var copy = obj.constructor(); - for (var attr in obj) { - if (obj.hasOwnProperty(attr)) - copy[attr] = obj[attr]; - } - return copy; -}; -const targets = (f, options) => { - const srcParts = path.parse(f); - const variables = clone(options.variables || {}); - const targets = []; - const rel = path.relative(options.srcInfo.DIR, srcParts.dir); - if (options.dstInfo.IS_GLOB) { - options.dstInfo.GLOB_EXTENSIONS.forEach((e) => { - variables.SRC_NAME = srcParts.name; - variables.SRC_DIR = srcParts.dir; - let targetPath = (0, osr_commons_2.substitute)(options.alt, variables.DST_PATH, variables); - targetPath = targetPath.replace(variables.DST_GLOB, ''); - if (variables.DST_FILE_EXT) { - targetPath = targetPath.replace('.' + variables.DST_FILE_EXT, ''); - } - const parts = path.parse(targetPath); - //back compat - if (variables.DST_NAME === '*') { - variables.DST_NAME = ''; - } - if (!parts.ext) { - if (variables.DST_PATH.indexOf(`{SRC_NAME}`) === -1) { - targetPath = path.join(targetPath, rel, srcParts.name + variables.DST_NAME.replace(variables.DST_GLOB, '') + '.' + e); - } - else { - targetPath = targetPath + variables.DST_NAME.replace(variables.DST_GLOB, '') + '.' + e; - } - } - //src.base contains dots - if (!targetPath.endsWith('.' + e)) { - targetPath += '.' + e; - } - targets.push(path.resolve(targetPath)); - }); - } - else { - let targetPath = ''; - if (!variables.DST_PATH) { - targetPath = path.join(srcParts.dir, srcParts.base); - } - else { - variables.SRC_NAME = srcParts.name; - variables.SRC_DIR = srcParts.dir; - targetPath = (0, osr_commons_2.substitute)(options.alt, variables.DST_PATH, variables); - if ((0, osr_commons_1.isFile)(f) && (0, exists_1.sync)(f)) { - // targetPath = path.join(targetPath, srcParts.base) - } - else { - targetPath = path.join(targetPath, srcParts.base); - } - const targetParts = path.parse(targetPath); - if (!targetParts.ext) { - targetPath = path.join(targetPath, srcParts.base); - } - } - targets.push(path.resolve((0, osr_commons_1.resolve)(targetPath, options.alt, variables))); - } - return targets; -}; -exports.targets = targets; -const targetsNext = (f, options) => { - const srcParts = path.parse(f); - const variables = clone(options.variables || {}); - const targets = []; - const rel = path.relative(options.srcInfo.DIR, srcParts.dir); - if (options.dstInfo.IS_GLOB) { - options.dstInfo.GLOB_EXTENSIONS.forEach((e) => { - variables.SRC_NAME = srcParts.name; - variables.SRC_DIR = srcParts.dir; - let targetPath = (0, osr_commons_2.substitute)(options.alt, variables.DST_PATH, variables); - targetPath = targetPath.replace(variables.DST_GLOB, ''); - if (variables.DST_FILE_EXT) { - targetPath = targetPath.replace('.' + variables.DST_FILE_EXT, ''); - } - const parts = path.parse(targetPath); - //back compat - if (variables.DST_NAME === '*') { - variables.DST_NAME = ''; - } - if (!parts.ext) { - if (variables.DST_PATH.indexOf(`{SRC_NAME}`) === -1) { - targetPath = path.join(targetPath, rel, srcParts.name + variables.DST_NAME.replace(variables.DST_GLOB, '') + '.' + e); - } - else { - targetPath = targetPath + variables.DST_NAME.replace(variables.DST_GLOB, '') + '.' + e; - } - } - //src.base contains dots - if (!targetPath.endsWith('.' + e)) { - targetPath += '.' + e; - } - targets.push(path.resolve(targetPath)); - }); - } - else { - let targetPath = ''; - if (!variables.DST_PATH) { - targetPath = path.join(srcParts.dir, srcParts.base); - } - else { - variables.SRC_NAME = srcParts.name; - variables.SRC_DIR = srcParts.dir; - variables.SRC_DIR = srcParts.dir; - targetPath = (0, osr_commons_2.substitute)(options.alt, variables.DST_PATH, variables); - if ((0, osr_commons_1.isFile)(f) && (0, exists_1.sync)(f)) { - // targetPath = path.join(targetPath, srcParts.base) - } - else { - targetPath = path.join(targetPath, srcParts.base); - } - const targetParts = path.parse(targetPath); - if (!targetParts.ext) { - targetPath = path.join(targetPath, srcParts.base); - } - } - targets.push(path.resolve((0, osr_commons_1.resolve)(targetPath, options.alt, variables))); - } - return targets; -}; -exports.targetsNext = targetsNext; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvbGliL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZCQUE0QjtBQUM1QixrREFBc0Q7QUFDdEQsOENBQWtEO0FBQ2xELHlEQUF5RDtBQUV6RCx5REFBb0Q7QUFHN0MsTUFBTSxZQUFZLEdBQUcsQ0FBQyxJQUFZLEVBQUUsRUFBRSxDQUFDLElBQUEsV0FBSSxFQUFDLElBQUksRUFBRSxRQUFRLENBQVcsSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0FBQW5GLFFBQUEsWUFBWSxnQkFBdUU7QUFFaEcsTUFBTSxLQUFLLEdBQUcsQ0FBQyxHQUFHLEVBQUUsRUFBRTtJQUNsQixJQUFJLElBQUksSUFBSSxHQUFHLElBQUksUUFBUSxJQUFJLE9BQU8sR0FBRztRQUFFLE9BQU8sR0FBRyxDQUFDO0lBQ3RELElBQUksSUFBSSxHQUFHLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUM3QixLQUFLLElBQUksSUFBSSxJQUFJLEdBQUcsRUFBRTtRQUNsQixJQUFJLEdBQUcsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDO1lBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztLQUN4RDtJQUNELE9BQU8sSUFBSSxDQUFDO0FBQ2hCLENBQUMsQ0FBQTtBQUVNLE1BQU0sT0FBTyxHQUFHLENBQUMsQ0FBUyxFQUFFLE9BQXVCLEVBQUUsRUFBRTtJQUMxRCxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQzlCLE1BQU0sU0FBUyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsU0FBUyxJQUFJLEVBQUUsQ0FBQyxDQUFBO0lBQ2hELE1BQU0sT0FBTyxHQUFhLEVBQUUsQ0FBQTtJQUM1QixNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FB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 \ No newline at end of file +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.targetsNext = exports.targets = exports.fileAsBuffer = void 0; +const path = require("path"); +const exists_1 = require("@plastichub/fs/exists"); +const read_1 = require("@plastichub/fs/read"); +const osr_commons_1 = require("@plastichub/osr-commons"); +const osr_commons_2 = require("@plastichub/osr-commons"); +const fileAsBuffer = (path) => (0, read_1.sync)(path, 'buffer') || Buffer.from("-"); +exports.fileAsBuffer = fileAsBuffer; +const clone = (obj) => { + if (null == obj || "object" != typeof obj) + return obj; + var copy = obj.constructor(); + for (var attr in obj) { + if (obj.hasOwnProperty(attr)) + copy[attr] = obj[attr]; + } + return copy; +}; +const targets = (f, options) => { + const srcParts = path.parse(f); + const variables = clone(options.variables || {}); + const targets = []; + const rel = path.relative(options.srcInfo.DIR, srcParts.dir); + if (options.dstInfo.IS_GLOB) { + options.dstInfo.GLOB_EXTENSIONS.forEach((e) => { + variables.SRC_NAME = srcParts.name; + variables.SRC_DIR = srcParts.dir; + let targetPath = (0, osr_commons_2.substitute)(options.alt, variables.DST_PATH, variables); + targetPath = targetPath.replace(variables.DST_GLOB, ''); + if (variables.DST_FILE_EXT) { + targetPath = targetPath.replace('.' + variables.DST_FILE_EXT, ''); + } + const parts = path.parse(targetPath); + //back compat + if (variables.DST_NAME === '*') { + variables.DST_NAME = ''; + } + if (!parts.ext) { + if (variables.DST_PATH.indexOf(`{SRC_NAME}`) === -1) { + targetPath = path.join(targetPath, rel, srcParts.name + variables.DST_NAME.replace(variables.DST_GLOB, '') + '.' + e); + } + else { + targetPath = targetPath + variables.DST_NAME.replace(variables.DST_GLOB, '') + '.' + e; + } + } + //src.base contains dots + if (!targetPath.endsWith('.' + e)) { + targetPath += '.' + e; + } + targets.push(path.resolve(targetPath)); + }); + } + else { + let targetPath = ''; + if (!variables.DST_PATH) { + targetPath = path.join(srcParts.dir, srcParts.base); + } + else { + variables.SRC_NAME = srcParts.name; + variables.SRC_DIR = srcParts.dir; + targetPath = (0, osr_commons_2.substitute)(options.alt, variables.DST_PATH, variables); + if ((0, osr_commons_1.isFile)(f) && (0, exists_1.sync)(f)) { + // targetPath = path.join(targetPath, srcParts.base) + } + else { + targetPath = path.join(targetPath, srcParts.base); + } + const targetParts = path.parse(targetPath); + if (!targetParts.ext) { + targetPath = path.join(targetPath, srcParts.base); + } + } + targets.push(path.resolve((0, osr_commons_1.resolve)(targetPath, options.alt, variables))); + } + return targets; +}; +exports.targets = targets; +const targetsNext = (f, options) => { + const srcParts = path.parse(f); + const variables = clone(options.variables || {}); + const targets = []; + const rel = path.relative(options.srcInfo.DIR, srcParts.dir); + if (options.dstInfo.IS_GLOB) { + options.dstInfo.GLOB_EXTENSIONS.forEach((e) => { + variables.SRC_NAME = srcParts.name; + variables.SRC_DIR = srcParts.dir; + let targetPath = (0, osr_commons_2.substitute)(options.alt, variables.DST_PATH, variables); + targetPath = targetPath.replace(variables.DST_GLOB, ''); + if (variables.DST_FILE_EXT) { + targetPath = targetPath.replace('.' + variables.DST_FILE_EXT, ''); + } + const parts = path.parse(targetPath); + //back compat + if (variables.DST_NAME === '*') { + variables.DST_NAME = ''; + } + if (!parts.ext) { + if (variables.DST_PATH.indexOf(`{SRC_NAME}`) === -1) { + targetPath = path.join(targetPath, rel, srcParts.name + variables.DST_NAME.replace(variables.DST_GLOB, '') + '.' + e); + } + else { + targetPath = targetPath + variables.DST_NAME.replace(variables.DST_GLOB, '') + '.' + e; + } + } + //src.base contains dots + if (!targetPath.endsWith('.' + e)) { + targetPath += '.' + e; + } + targets.push(path.resolve(targetPath)); + }); + } + else { + let targetPath = ''; + if (!variables.DST_PATH) { + targetPath = path.join(srcParts.dir, srcParts.base); + } + else { + variables.SRC_NAME = srcParts.name; + variables.SRC_DIR = srcParts.dir; + variables.SRC_DIR = srcParts.dir; + targetPath = (0, osr_commons_2.substitute)(options.alt, variables.DST_PATH, variables); + if ((0, osr_commons_1.isFile)(f) && (0, exists_1.sync)(f)) { + // targetPath = path.join(targetPath, srcParts.base) + } + else { + targetPath = path.join(targetPath, srcParts.base); + } + const targetParts = path.parse(targetPath); + if (!targetParts.ext) { + targetPath = path.join(targetPath, srcParts.base); + } + } + targets.push(path.resolve((0, osr_commons_1.resolve)(targetPath, options.alt, variables))); + } + return targets; +}; +exports.targetsNext = targetsNext; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvbGliL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZCQUE0QjtBQUM1QixrREFBc0Q7QUFDdEQsOENBQWtEO0FBQ2xELHlEQUF5RDtBQUV6RCx5REFBb0Q7QUFHN0MsTUFBTSxZQUFZLEdBQUcsQ0FBQyxJQUFZLEVBQUUsRUFBRSxDQUFDLElBQUEsV0FBSSxFQUFDLElBQUksRUFBRSxRQUFRLENBQVcsSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0FBQW5GLFFBQUEsWUFBWSxnQkFBdUU7QUFFaEcsTUFBTSxLQUFLLEdBQUcsQ0FBQyxHQUFHLEVBQUUsRUFBRTtJQUNsQixJQUFJLElBQUksSUFBSSxHQUFHLElBQUksUUFBUSxJQUFJLE9BQU8sR0FBRztRQUFFLE9BQU8sR0FBRyxDQUFDO0lBQ3RELElBQUksSUFBSSxHQUFHLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUM3QixLQUFLLElBQUksSUFBSSxJQUFJLEdBQUcsRUFBRSxDQUFDO1FBQ25CLElBQUksR0FBRyxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUM7WUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3pELENBQUM7SUFDRCxPQUFPLElBQUksQ0FBQztBQUNoQixDQUFDLENBQUE7QUFFTSxNQUFNLE9BQU8sR0FBRyxDQUFDLENBQVMsRUFBRSxPQUF1QixFQUFFLEVBQUU7SUFDMUQsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUM5QixNQUFNLFNBQVMsR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLFNBQVMsSUFBSSxFQUFFLENBQUMsQ0FBQTtJQUNoRCxNQUFNLE9BQU8sR0FBYSxFQUFFLENBQUE7SUFDNUIsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FB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 \ No newline at end of file diff --git a/packages/media/lib/media/audio/convert.d.ts b/packages/media/lib/media/audio/convert.d.ts index 32d21c3f..7903b9de 100644 --- a/packages/media/lib/media/audio/convert.d.ts +++ b/packages/media/lib/media/audio/convert.d.ts @@ -1,13 +1,13 @@ -import { IConvertVideoOptions } from '../../../types'; -export declare const split: (src: string, dst: string, onNode: any, options: { - interval: number; -}) => Promise; -export declare const CONVERTERS: { - '.mp3': (src: string, dst: string, onNode: any, options: { - interval: number; - }) => Promise; -}; -export declare const converter: (file: string) => any; -export declare const convertFile: (file: any, target: any, onNode: (data: any) => void, options: IConvertVideoOptions) => Promise; -export declare function _convert(file: any, targets: string[], onNode: (data: any) => void, options: IConvertVideoOptions): Promise; -export declare const convert: (options: IConvertVideoOptions) => Promise; +import { IConvertVideoOptions } from '../../../types'; +export declare const split: (src: string, dst: string, onNode: any, options: { + interval: number; +}) => Promise; +export declare const CONVERTERS: { + '.mp3': (src: string, dst: string, onNode: any, options: { + interval: number; + }) => Promise; +}; +export declare const converter: (file: string) => any; +export declare const convertFile: (file: any, target: any, onNode: (data: any) => void, options: IConvertVideoOptions) => Promise; +export declare function _convert(file: any, targets: string[], onNode: (data: any) => void, options: IConvertVideoOptions): Promise; +export declare const convert: (options: IConvertVideoOptions) => Promise; diff --git a/packages/media/lib/media/audio/convert.js b/packages/media/lib/media/audio/convert.js index 60aaddbf..30bb8562 100644 --- a/packages/media/lib/media/audio/convert.js +++ b/packages/media/lib/media/audio/convert.js @@ -1,95 +1,95 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.convert = exports._convert = exports.convertFile = exports.converter = exports.CONVERTERS = exports.split = void 0; -const path = require("path"); -const pMap = require("p-map"); -const osr_commons_1 = require("@plastichub/osr-commons"); -const exists_1 = require("@plastichub/fs/exists"); -const dir_1 = require("@plastichub/fs/dir"); -const lib_1 = require("@plastichub/osr-cache/lib"); -const __1 = require("../../"); -const __2 = require("../../.."); -const constants_1 = require("../../../constants"); -const ffmpeg_1 = require("../ffmpeg"); -const FfmpegCommand = require('fluent-ffmpeg'); -const extension = (file) => path.parse(file).ext; -const split = async (src, dst, onNode, options) => { - try { - const metadata = await (0, ffmpeg_1.meta)(src); - const duration = metadata.format.duration; - if (!duration) { - __2.logger.error('Unable to determine duration of the audio file.'); - return; - } - let startTime = 0; - let segmentIndex = 1; - while (startTime < duration) { - const outputFile = `${dst}/segment_${segmentIndex}.mp3`; - await new Promise((resolve, reject) => { - const ff = new FfmpegCommand(src) - .setStartTime(startTime) - .setDuration(options.interval) - .output(outputFile) - .on('end', () => { - __2.logger.info(`Segment ${segmentIndex} finished.`); - resolve(); - }) - .on('error', (error) => { - __2.logger.error(`Error while processing segment ${segmentIndex}:`, error.message); - reject(error); - }) - .run(); - }); - startTime += options.interval; - segmentIndex++; - } - } - catch (error) { - __2.logger.error('Error splitting audio file:', error); - } -}; -exports.split = split; -exports.CONVERTERS = { - '.mp3': exports.split -}; -const converter = (file) => exports.CONVERTERS[extension(file)]; -exports.converter = converter; -const convertFile = async (file, target, onNode = () => { }, options) => { - const osr_cache = (0, osr_commons_1.OSR_CACHE)(); - const ca_options = JSON.parse(JSON.stringify({ ...options, target, skip: null })); - const cached = await (0, lib_1.get_cached)(file, ca_options, constants_1.MODULE_NAME); - const conv = (0, exports.converter)(target); - if (!conv) { - __2.logger.error(`No converter found for ${file}`); - return; - } - const dstParts = path.parse(target); - if (!(0, exists_1.sync)(dstParts.dir)) { - (0, dir_1.sync)(dstParts.dir); - } - const ret = await conv(file, target, onNode, options); - return ret; -}; -exports.convertFile = convertFile; -async function _convert(file, targets, onNode = () => { }, options) { - return pMap(targets, (target) => { - options.verbose && __2.logger.debug(`Convert ${file} to ${target}`); - if (options.dry) { - return; - } - return (0, exports.convertFile)(file, target, onNode, options); - }, { concurrency: 1 }); -} -exports._convert = _convert; -const convert = async (options) => { - let reports = []; - const onNode = (data) => { reports.push(data); }; - options.verbose && __2.logger.info(`Convert ${options.srcInfo.FILES.length} files `); - await pMap(options.srcInfo.FILES, (f) => { - const outputs = (0, __1.targets)(f, options); - options.verbose && __2.logger.info(`Convert ${f} to `, outputs); - return _convert(f, outputs, onNode, options); - }, { concurrency: 1 }); -}; -exports.convert = convert; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udmVydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9saWIvbWVkaWEvYXVkaW8vY29udmVydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2QkFBNEI7QUFDNUIsOEJBQTZCO0FBQzdCLHlEQUFtRDtBQUNuRCxrREFBc0Q7QUFDdEQsNENBQWdEO0FBQ2hELG1EQUFzRDtBQUN0RCw4QkFBZ0M7QUFDaEMsZ0NBQWlDO0FBQ2pDLGtEQUFnRDtBQUdoRCxzQ0FBZ0M7QUFJaEMsTUFBTSxhQUFhLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFBO0FBRTlDLE1BQU0sU0FBUyxHQUFHLENBQUMsSUFBWSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLEdBQUcsQ0FBQTtBQUVqRCxNQUFNLEtBQUssR0FBRyxLQUFLLEVBQUUsR0FBVyxFQUFFLEdBQVcsRUFBRSxNQUFNLEVBQUUsT0FBNkIsRUFBaUIsRUFBRTtJQUMxRyxJQUFJO1FBQ0EsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFBLGFBQUksRUFBQyxHQUFHLENBQUMsQ0FBQTtRQUNoQyxNQUFNLFFBQVEsR0FBRyxRQUFRLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQTtRQUN6QyxJQUFJLENBQUMsUUFBUSxFQUFFO1lBQ1gsVUFBTSxDQUFDLEtBQUssQ0FBQyxpREFBaUQsQ0FBQyxDQUFDO1lBQ2hFLE9BQU87U0FDVjtRQUVELElBQUksU0FBUyxHQUFHLENBQUMsQ0FBQTtRQUNqQixJQUFJLFlBQVksR0FBRyxDQUFDLENBQUE7UUFFcEIsT0FBTyxTQUFTLEdBQUcsUUFBUSxFQUFFO1lBQ3pCLE1BQU0sVUFBVSxHQUFHLEdBQUcsR0FBRyxZQUFZLFlBQVksTUFBTSxDQUFDO1lBRXhELE1BQU0sSUFBSSxPQUFPLENBQU8sQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7Z0JBQ3hDLE1BQU0sRUFBRSxHQUFHLElBQUks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 \ No newline at end of file +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.convert = exports.convertFile = exports.converter = exports.CONVERTERS = exports.split = void 0; +exports._convert = _convert; +const path = require("path"); +const pMap = require("p-map"); +const osr_commons_1 = require("@plastichub/osr-commons"); +const exists_1 = require("@plastichub/fs/exists"); +const dir_1 = require("@plastichub/fs/dir"); +const lib_1 = require("@plastichub/osr-cache/lib"); +const __1 = require("../../"); +const __2 = require("../../.."); +const constants_1 = require("../../../constants"); +const ffmpeg_1 = require("../ffmpeg"); +const FfmpegCommand = require('fluent-ffmpeg'); +const extension = (file) => path.parse(file).ext; +const split = async (src, dst, onNode, options) => { + try { + const metadata = await (0, ffmpeg_1.meta)(src); + const duration = metadata.format.duration; + if (!duration) { + __2.logger.error('Unable to determine duration of the audio file.'); + return; + } + let startTime = 0; + let segmentIndex = 1; + while (startTime < duration) { + const outputFile = `${dst}/segment_${segmentIndex}.mp3`; + await new Promise((resolve, reject) => { + const ff = new FfmpegCommand(src) + .setStartTime(startTime) + .setDuration(options.interval) + .output(outputFile) + .on('end', () => { + __2.logger.info(`Segment ${segmentIndex} finished.`); + resolve(); + }) + .on('error', (error) => { + __2.logger.error(`Error while processing segment ${segmentIndex}:`, error.message); + reject(error); + }) + .run(); + }); + startTime += options.interval; + segmentIndex++; + } + } + catch (error) { + __2.logger.error('Error splitting audio file:', error); + } +}; +exports.split = split; +exports.CONVERTERS = { + '.mp3': exports.split +}; +const converter = (file) => exports.CONVERTERS[extension(file)]; +exports.converter = converter; +const convertFile = async (file, target, onNode = () => { }, options) => { + const osr_cache = (0, osr_commons_1.OSR_CACHE)(); + const ca_options = JSON.parse(JSON.stringify({ ...options, target, skip: null })); + const cached = await (0, lib_1.get_cached)(file, ca_options, constants_1.MODULE_NAME); + const conv = (0, exports.converter)(target); + if (!conv) { + __2.logger.error(`No converter found for ${file}`); + return; + } + const dstParts = path.parse(target); + if (!(0, exists_1.sync)(dstParts.dir)) { + (0, dir_1.sync)(dstParts.dir); + } + const ret = await conv(file, target, onNode, options); + return ret; +}; +exports.convertFile = convertFile; +async function _convert(file, targets, onNode = () => { }, options) { + return pMap(targets, (target) => { + options.verbose && __2.logger.debug(`Convert ${file} to ${target}`); + if (options.dry) { + return; + } + return (0, exports.convertFile)(file, target, onNode, options); + }, { concurrency: 1 }); +} +const convert = async (options) => { + let reports = []; + const onNode = (data) => { reports.push(data); }; + options.verbose && __2.logger.info(`Convert ${options.srcInfo.FILES.length} files `); + await pMap(options.srcInfo.FILES, (f) => { + const outputs = (0, __1.targets)(f, options); + options.verbose && __2.logger.info(`Convert ${f} to `, outputs); + return _convert(f, outputs, onNode, options); + }, { concurrency: 1 }); +}; +exports.convert = convert; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udmVydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9saWIvbWVkaWEvYXVkaW8vY29udmVydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUErRUEsNEJBUUM7QUF2RkQsNkJBQTRCO0FBQzVCLDhCQUE2QjtBQUM3Qix5REFBbUQ7QUFDbkQsa0RBQXNEO0FBQ3RELDRDQUFnRDtBQUNoRCxtREFBc0Q7QUFDdEQsOEJBQWdDO0FBQ2hDLGdDQUFpQztBQUNqQyxrREFBZ0Q7QUFHaEQsc0NBQWdDO0FBSWhDLE1BQU0sYUFBYSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQTtBQUU5QyxNQUFNLFNBQVMsR0FBRyxDQUFDLElBQVksRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLENBQUE7QUFFakQsTUFBTSxLQUFLLEdBQUcsS0FBSyxFQUFFLEdBQVcsRUFBRSxHQUFXLEVBQUUsTUFBTSxFQUFFLE9BQTZCLEVBQWlCLEVBQUU7SUFDMUcsSUFBSSxDQUFDO1FBQ0QsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFBLGFBQUksRUFBQyxHQUFHLENBQUMsQ0FBQTtRQUNoQyxNQUFNLFFBQVEsR0FBRyxRQUFRLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQTtRQUN6QyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDWixVQUFNLENBQUMsS0FBSyxDQUFDLGlEQUFpRCxDQUFDLENBQUM7WUFDaEUsT0FBTztRQUNYLENBQUM7UUFFRCxJQUFJLFNBQVMsR0FBRyxDQUFDLENBQUE7UUFDakIsSUFBSSxZQUFZLEdBQUcsQ0FBQyxDQUFBO1FBRXBCLE9BQU8sU0FBUyxHQUFHLFFBQVEsRUFBRSxDQUFDO1lBQzFCLE1BQU0sVUFBVSxHQUFHLEdBQUcsR0FBRyxZQUFZLFlBQVksTUFBTSxDQUFDO1lBRXhELE1BQU0sSUFBSSxPQUFPLENBQU8sQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFF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 \ No newline at end of file diff --git a/packages/media/lib/media/ffmpeg.d.ts b/packages/media/lib/media/ffmpeg.d.ts index 94eb8d0c..ef63fcc2 100644 --- a/packages/media/lib/media/ffmpeg.d.ts +++ b/packages/media/lib/media/ffmpeg.d.ts @@ -1,2 +1,2 @@ -import { FfprobeData } from 'fluent-ffmpeg'; -export declare const meta: (src: string) => Promise; +import { FfprobeData } from 'fluent-ffmpeg'; +export declare const meta: (src: string) => Promise; diff --git a/packages/media/lib/media/ffmpeg.js b/packages/media/lib/media/ffmpeg.js index c8b82438..df28e657 100644 --- a/packages/media/lib/media/ffmpeg.js +++ b/packages/media/lib/media/ffmpeg.js @@ -1,21 +1,21 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.meta = void 0; -const FfmpegCommand = require('fluent-ffmpeg'); -const meta = async (src) => { - return new Promise((resolve, reject) => { - const ff = new FfmpegCommand(src); - ff.ffprobe(src, (err, metadata) => { - if (err) { - //logger.error('Error retrieving metadata:', err) - reject(err); - } - else { - //logger.info('Successfully retrieved metadata.'); - resolve(metadata); - } - }); - }); -}; -exports.meta = meta; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmZtcGVnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xpYi9tZWRpYS9mZm1wZWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBRUEsTUFBTSxhQUFhLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFBO0FBRXZDLE1BQU0sSUFBSSxHQUFHLEtBQUssRUFBRSxHQUFXLEVBQXdCLEVBQUU7SUFDNUQsT0FBTyxJQUFJLE9BQU8sQ0FBQyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRTtRQUNyQyxNQUFNLEVBQUUsR0FBRyxJQUFJLGFBQWEsQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUNqQyxFQUFFLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDLEdBQUcsRUFBRSxRQUFRLEVBQUUsRUFBRTtZQUNoQyxJQUFJLEdBQUcsRUFBRTtnQkFDUCxpREFBaUQ7Z0JBQ2pELE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQzthQUNiO2lCQUFNO2dCQUNMLGtEQUFrRDtnQkFDbEQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFBO2FBQ2xCO1FBQ0gsQ0FBQyxDQUFDLENBQUE7SUFDSixDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUMsQ0FBQTtBQWJVLFFBQUEsSUFBSSxRQWFkIn0= \ No newline at end of file +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.meta = void 0; +const FfmpegCommand = require('fluent-ffmpeg'); +const meta = async (src) => { + return new Promise((resolve, reject) => { + const ff = new FfmpegCommand(src); + ff.ffprobe(src, (err, metadata) => { + if (err) { + //logger.error('Error retrieving metadata:', err) + reject(err); + } + else { + //logger.info('Successfully retrieved metadata.'); + resolve(metadata); + } + }); + }); +}; +exports.meta = meta; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmZtcGVnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xpYi9tZWRpYS9mZm1wZWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBRUEsTUFBTSxhQUFhLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFBO0FBRXZDLE1BQU0sSUFBSSxHQUFHLEtBQUssRUFBRSxHQUFXLEVBQXdCLEVBQUU7SUFDNUQsT0FBTyxJQUFJLE9BQU8sQ0FBQyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRTtRQUNyQyxNQUFNLEVBQUUsR0FBRyxJQUFJLGFBQWEsQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUNqQyxFQUFFLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDLEdBQUcsRUFBRSxRQUFRLEVBQUUsRUFBRTtZQUNoQyxJQUFJLEdBQUcsRUFBRSxDQUFDO2dCQUNSLGlEQUFpRDtnQkFDakQsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ2QsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLGtEQUFrRDtnQkFDbEQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFBO1lBQ25CLENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQTtJQUNKLENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyxDQUFBO0FBYlUsUUFBQSxJQUFJLFFBYWQifQ== \ No newline at end of file diff --git a/packages/media/lib/media/images/convert.d.ts b/packages/media/lib/media/images/convert.d.ts index 2ef3d53a..968341ad 100644 --- a/packages/media/lib/media/images/convert.d.ts +++ b/packages/media/lib/media/images/convert.d.ts @@ -1,5 +1,4 @@ -import * as sharp from 'sharp'; -import { IOptions, IResizeOptions } from '../../../types'; -export declare const convertFile: (file: any, target: any, onNode: (data: any) => void, options: IResizeOptions) => Promise; -export declare function _convert(file: any, targets: string[], onNode: (data: any) => void, options: IOptions): Promise; -export declare const convert: (options: IOptions) => Promise; +import { IOptions, IResizeOptions } from '../../../types'; +export declare const convertFile: (file: any, target: any, onNode: (data: any) => void, options: IResizeOptions) => Promise; +export declare function _convert(file: any, targets: string[], onNode: (data: any) => void, options: IOptions): Promise; +export declare const convert: (options: IOptions) => Promise; diff --git a/packages/media/lib/media/images/convert.js b/packages/media/lib/media/images/convert.js index 76e26ebe..6afbd1ea 100644 --- a/packages/media/lib/media/images/convert.js +++ b/packages/media/lib/media/images/convert.js @@ -1,50 +1,50 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.convert = exports._convert = exports.convertFile = void 0; -const path = require("path"); -const bluebird = require("bluebird"); -const pMap = require("p-map"); -const sharp = require("sharp"); -const index_1 = require("../../../index"); -const osr_commons_1 = require("@plastichub/osr-commons"); -const exists_1 = require("@plastichub/fs/exists"); -const dir_1 = require("@plastichub/fs/dir"); -const lib_1 = require("@plastichub/osr-cache/lib"); -const __1 = require("../../"); -const constants_1 = require("../../../constants"); -const convertFile = async (file, target, onNode = () => { }, options) => { - const osr_cache = (0, osr_commons_1.OSR_CACHE)(); - const ca_options = JSON.parse(JSON.stringify({ ...options, target, skip: null })); - const cached = await (0, lib_1.get_cached)(file, ca_options, constants_1.MODULE_NAME); - let image = sharp(file); - const srcParts = path.parse(file); - const dstParts = path.parse(target); - if (!(0, exists_1.sync)(dstParts.dir)) { - (0, dir_1.sync)(dstParts.dir); - } - let ret = await image.withMetadata().toFile(target); - return ret; -}; -exports.convertFile = convertFile; -async function _convert(file, targets, onNode = () => { }, options) { - return pMap(targets, async (target) => { - index_1.logger.debug(`Convert ${file} to ${target}`); - if (options.dry) { - return bluebird.resolve(); - } - return (0, exports.convertFile)(file, target, onNode, options); - }, { concurrency: 1 }); -} -exports._convert = _convert; -const convert = async (options) => { - let reports = []; - const onNode = (data) => { reports.push(data); }; - index_1.logger.info(`Convert ${options.srcInfo.FILES.length} files `); - await pMap(options.srcInfo.FILES, (f) => { - const outputs = (0, __1.targets)(f, options); - options.verbose && index_1.logger.info(`Convert ${f} to `, outputs); - return _convert(f, outputs, onNode, options); - }, { concurrency: 1 }); -}; -exports.convert = convert; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udmVydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9saWIvbWVkaWEvaW1hZ2VzL2NvbnZlcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkJBQTRCO0FBQzVCLHFDQUFvQztBQUNwQyw4QkFBNkI7QUFDN0IsK0JBQThCO0FBQzlCLDBDQUF1QztBQUV2Qyx5REFBbUQ7QUFDbkQsa0RBQXNEO0FBQ3RELDRDQUFnRDtBQUNoRCxtREFFa0M7QUFFbEMsOEJBRWU7QUFFZixrREFFMkI7QUFFcEIsTUFBTSxXQUFXLEdBQUcsS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsU0FBOEIsR0FBRyxFQUFFLEdBQUcsQ0FBQyxFQUFFLE9BQXVCLEVBQUUsRUFBRTtJQUNoSCxNQUFNLFNBQVMsR0FBRyxJQUFBLHVCQUFTLEdBQUUsQ0FBQTtJQUM3QixNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsRUFBRSxHQUFHLE9BQU8sRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQTtJQUNqRixNQUFNLE1BQU0sR0FBRyxNQUFNLElBQUEsZ0JBQVUsRUFBQyxJQUFJLEVBQUUsVUFBVSxFQUFFLHVCQUFXLENBQUMsQ0FBQTtJQUM5RCxJQUFJLEtBQUssR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDdkIsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUNqQyxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQ25DLElBQUcsQ0FBQyxJQUFBLGFBQU0sRUFBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEVBQUM7UUFDckIsSUFBQSxVQUFHLEVBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0tBQ3BCO0lBQ0QsSUFBSSxHQUFHLEdBQUcsTUFBTSxLQUFLLENBQUMsWUFBWSxFQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQ25ELE9BQU8sR0FBRyxDQUFBO0FBQ2QsQ0FBQyxDQUFBO0FBWlksUUFBQSxXQUFXLGVBWXZCO0FBQ00sS0FBSyxVQUFVLFFBQVEsQ0FBQyxJQUFJLEVBQUUsT0FBaUIsRUFBRSxTQUE4QixHQUFHLEVBQUUsR0FBRyxDQUFDLEVBQUUsT0FBaUI7SUFDOUcsT0FBTyxJQUFJLENBQUMsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsRUFBRTtRQUNsQyxjQUFNLENBQUMsS0FBSyxDQUFDLFdBQVcsSUFBSSxPQUFPLE1BQU0sRUFBRSxDQUFDLENBQUM7UUFDN0MsSUFBSSxPQUFPLENBQUMsR0FBRyxFQUFFO1lBQ2IsT0FBTyxRQUFRLENBQUMsT0FBTyxFQUFFLENBQUM7U0FDN0I7UUFDRCxPQUFPLElBQUEsbUJBQVcsRUFBQyxJQUFJLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxPQUFPLENBQUMsQ0FBQztJQUN0RCxDQUFDLEVBQUUsRUFBRSxXQUFXLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQztBQUMzQixDQUFDO0FBUkQsNEJBUUM7QUFFTSxNQUFNLE9BQU8sR0FBRyxLQUFLLEVBQUUsT0FBaUIsRUFBRSxFQUFFO0lBQy9DLElBQUksT0FBTyxHQUFHLEVBQUUsQ0FBQTtJQUNoQixNQUFNLE1BQU0sR0FBRyxDQUFDLElBQUksRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQTtJQUMvQyxjQUFNLENBQUMsSUFBSSxDQUFDLFdBQVcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsTUFBTSxTQUFTLENBQUMsQ0FBQTtJQUM3RCxNQUFNLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBQyxDQUFDLENBQUMsRUFBRSxFQUFFO1FBQ25DLE1BQU0sT0FBTyxHQUFHLElBQUEsV0FBTyxFQUFDLENBQUMsRUFBRSxPQUFPLENBQUMsQ0FBQTtRQUNuQyxPQUFPLENBQUMsT0FBTyxJQUFJLGNBQU0sQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsQ0FBQTtRQUMzRCxPQUFPLFFBQVEsQ0FBQyxDQUFDLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxPQUFPLENBQUMsQ0FBQTtJQUNoRCxDQUFDLEVBQUUsRUFBRSxXQUFXLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQTtBQUMxQixDQUFDLENBQUE7QUFUWSxRQUFBLE9BQU8sV0FTbkIifQ== \ No newline at end of file +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.convert = exports.convertFile = void 0; +exports._convert = _convert; +const path = require("path"); +const bluebird = require("bluebird"); +const pMap = require("p-map"); +const sharp = require("sharp"); +const index_1 = require("../../../index"); +const osr_commons_1 = require("@plastichub/osr-commons"); +const exists_1 = require("@plastichub/fs/exists"); +const dir_1 = require("@plastichub/fs/dir"); +const lib_1 = require("@plastichub/osr-cache/lib"); +const __1 = require("../../"); +const constants_1 = require("../../../constants"); +const convertFile = async (file, target, onNode = () => { }, options) => { + const osr_cache = (0, osr_commons_1.OSR_CACHE)(); + const ca_options = JSON.parse(JSON.stringify({ ...options, target, skip: null })); + const cached = await (0, lib_1.get_cached)(file, ca_options, constants_1.MODULE_NAME); + let image = sharp(file); + const srcParts = path.parse(file); + const dstParts = path.parse(target); + if (!(0, exists_1.sync)(dstParts.dir)) { + (0, dir_1.sync)(dstParts.dir); + } + let ret = await image.withMetadata().toFile(target); + return ret; +}; +exports.convertFile = convertFile; +async function _convert(file, targets, onNode = () => { }, options) { + return pMap(targets, async (target) => { + index_1.logger.debug(`Convert ${file} to ${target}`); + if (options.dry) { + return bluebird.resolve(); + } + return (0, exports.convertFile)(file, target, onNode, options); + }, { concurrency: 1 }); +} +const convert = async (options) => { + let reports = []; + const onNode = (data) => { reports.push(data); }; + index_1.logger.info(`Convert ${options.srcInfo.FILES.length} files `); + await pMap(options.srcInfo.FILES, (f) => { + const outputs = (0, __1.targets)(f, options); + options.verbose && index_1.logger.info(`Convert ${f} to `, outputs); + return _convert(f, outputs, onNode, options); + }, { concurrency: 1 }); +}; +exports.convert = convert; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udmVydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9saWIvbWVkaWEvaW1hZ2VzL2NvbnZlcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBa0NBLDRCQVFDO0FBMUNELDZCQUE0QjtBQUM1QixxQ0FBb0M7QUFDcEMsOEJBQTZCO0FBQzdCLCtCQUE4QjtBQUM5QiwwQ0FBdUM7QUFFdkMseURBQW1EO0FBQ25ELGtEQUFzRDtBQUN0RCw0Q0FBZ0Q7QUFDaEQsbURBRWtDO0FBRWxDLDhCQUVlO0FBRWYsa0RBRTJCO0FBRXBCLE1BQU0sV0FBVyxHQUFHLEtBQUssRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLFNBQThCLEdBQUcsRUFBRSxHQUFHLENBQUMsRUFBRSxPQUF1QixFQUFFLEVBQUU7SUFDaEgsTUFBTSxTQUFTLEdBQUcsSUFBQSx1QkFBUyxHQUFFLENBQUE7SUFDN0IsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsR0FBRyxPQUFPLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUE7SUFDakYsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFBLGdCQUFVLEVBQUMsSUFBSSxFQUFFLFVBQVUsRUFBRSx1QkFBVyxDQUFDLENBQUE7SUFDOUQsSUFBSSxLQUFLLEdBQUcsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQ3ZCLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDakMsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUNuQyxJQUFHLENBQUMsSUFBQSxhQUFNLEVBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxFQUFDLENBQUM7UUFDdEIsSUFBQSxVQUFHLEVBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQ3JCLENBQUM7SUFDRCxJQUFJLEdBQUcsR0FBRyxNQUFNLEtBQUssQ0FBQyxZQUFZLEVBQUUsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUE7SUFDbkQsT0FBTyxHQUFHLENBQUE7QUFDZCxDQUFDLENBQUE7QUFaWSxRQUFBLFdBQVcsZUFZdkI7QUFDTSxLQUFLLFVBQVUsUUFBUSxDQUFDLElBQUksRUFBRSxPQUFpQixFQUFFLFNBQThCLEdBQUcsRUFBRSxHQUFHLENBQUMsRUFBRSxPQUFpQjtJQUM5RyxPQUFPLElBQUksQ0FBQyxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxFQUFFO1FBQ2xDLGNBQU0sQ0FBQyxLQUFLLENBQUMsV0FBVyxJQUFJLE9BQU8sTUFBTSxFQUFFLENBQUMsQ0FBQztRQUM3QyxJQUFJLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUNkLE9BQU8sUUFBUSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQzlCLENBQUM7UUFDRCxPQUFPLElBQUEsbUJBQVcsRUFBQyxJQUFJLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxPQUFPLENBQUMsQ0FBQztJQUN0RCxDQUFDLEVBQUUsRUFBRSxXQUFXLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQztBQUMzQixDQUFDO0FBRU0sTUFBTSxPQUFPLEdBQUcsS0FBSyxFQUFFLE9BQWlCLEVBQUUsRUFBRTtJQUMvQyxJQUFJLE9BQU8sR0FBRyxFQUFFLENBQUE7SUFDaEIsTUFBTSxNQUFNLEdBQUcsQ0FBQyxJQUFJLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUE7SUFDL0MsY0FBTSxDQUFDLElBQUksQ0FBQyxXQUFXLE9BQU8sQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLE1BQU0sU0FBUyxDQUFDLENBQUE7SUFDN0QsTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUNuQyxNQUFNLE9BQU8sR0FBRyxJQUFBLFdBQU8sRUFBQyxDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUE7UUFDbkMsT0FBTyxDQUFDLE9BQU8sSUFBSSxjQUFNLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUE7UUFDM0QsT0FBTyxRQUFRLENBQUMsQ0FBQyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUE7SUFDaEQsQ0FBQyxFQUFFLEVBQUUsV0FBVyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUE7QUFDMUIsQ0FBQyxDQUFBO0FBVFksUUFBQSxPQUFPLFdBU25CIn0= \ No newline at end of file diff --git a/packages/media/lib/media/images/index.d.ts b/packages/media/lib/media/images/index.d.ts index 4cf2a63f..5df465ce 100644 --- a/packages/media/lib/media/images/index.d.ts +++ b/packages/media/lib/media/images/index.d.ts @@ -1,33 +1,32 @@ -export * from './resize'; -export * from './convert'; -export * from './watermark'; -import * as sharp from 'sharp'; -import { IResizeOptions } from '../../..'; -export declare const GLOB_BASIC = "png|jpg|tiff|jpeg|webp"; -export declare const GLOB_MIN = "*.{png,jpg,jpeg,PNG,JPG,JPEG}"; -export declare const files: (dir: any, glob: any) => any; -export declare const getFormats: (src: any, folder: any) => { - src: string; - dist: string; - format: string; -}[]; -export declare const getThumbnailOptions: (src: any, format: any) => { - src: string; - dist: string; - format: any; -}[]; -export declare const thumbnails: (options: IResizeOptions) => Promise; -export declare const meta: (file: any) => Promise; -export declare const format: (formats: any, options?: { - cache: boolean; - png: boolean; -}) => Promise; -export declare const getResizePatterns: (product: any, folder: any, percent?: number) => { - src: string; - dist: string; - percent: number; -}[]; -export declare const resize: (patterns: any, options?: { - cache: boolean; -}) => Promise; -export declare const resizeSharp: (patterns: any) => Promise; +export * from './resize'; +export * from './convert'; +export * from './watermark'; +import { IResizeOptions } from '../../..'; +export declare const GLOB_BASIC = "png|jpg|tiff|jpeg|webp"; +export declare const GLOB_MIN = "*.{png,jpg,jpeg,PNG,JPG,JPEG}"; +export declare const files: (dir: any, glob: any) => any; +export declare const getFormats: (src: any, folder: any) => { + src: string; + dist: string; + format: string; +}[]; +export declare const getThumbnailOptions: (src: any, format: any) => { + src: string; + dist: string; + format: any; +}[]; +export declare const thumbnails: (options: IResizeOptions) => Promise; +export declare const meta: (file: any) => Promise; +export declare const format: (formats: any, options?: { + cache: boolean; + png: boolean; +}) => Promise; +export declare const getResizePatterns: (product: any, folder: any, percent?: number) => { + src: string; + dist: string; + percent: number; +}[]; +export declare const resize: (patterns: any, options?: { + cache: boolean; +}) => Promise; +export declare const resizeSharp: (patterns: any) => Promise; diff --git a/packages/media/lib/media/images/index.js b/packages/media/lib/media/images/index.js index f2f64655..21b1a7ee 100644 --- a/packages/media/lib/media/images/index.js +++ b/packages/media/lib/media/images/index.js @@ -1,169 +1,169 @@ -"use strict"; -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - var desc = Object.getOwnPropertyDescriptor(m, k); - if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { - desc = { enumerable: true, get: function() { return m[k]; } }; - } - Object.defineProperty(o, k2, desc); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __exportStar = (this && this.__exportStar) || function(m, exports) { - for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p); -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.resizeSharp = exports.resize = exports.getResizePatterns = exports.format = exports.meta = exports.thumbnails = exports.getThumbnailOptions = exports.getFormats = exports.files = exports.GLOB_MIN = exports.GLOB_BASIC = void 0; -__exportStar(require("./resize"), exports); -__exportStar(require("./convert"), exports); -__exportStar(require("./watermark"), exports); -const pMap = require("p-map"); -const path = require("path"); -const fs = require("fs"); -const sharp = require("sharp"); -const exists_1 = require("@plastichub/fs/exists"); -const dir_1 = require("@plastichub/fs/dir"); -const fg = require('fast-glob'); -const glob = require('glob'); -const __1 = require("../../.."); -const _cli_1 = require("../../../_cli"); -//https://www.lightgalleryjs.com/demos/responsive/ -exports.GLOB_BASIC = 'png|jpg|tiff|jpeg|webp'; -exports.GLOB_MIN = '*.{png,jpg,jpeg,PNG,JPG,JPEG}'; -const resize_1 = require("./resize"); -const files = (dir, glob) => fg.sync(glob, { - dot: true, - cwd: dir, - absolute: true -}); -exports.files = files; -const getFormats = (src, folder) => { - return [{ - src: `${src}/${folder}/${exports.GLOB_MIN}`, - dist: `${src}/${folder}/webp`, - format: 'webp', - }]; -}; -exports.getFormats = getFormats; -const getThumbnailOptions = (src, format) => { - return [{ - src: `${src}/${exports.GLOB_MIN}`, - dist: "${SRC_DIR}/${SRC_NAME}_thumb.${FORMAT}", - format - }]; -}; -exports.getThumbnailOptions = getThumbnailOptions; -const thumbnails = async (options) => { - options = (0, _cli_1.sanitize)(options); - debugger; - __1.logger.setSettings({ minLevel: options.logLevel }); - return await (0, resize_1.resize)(options); -}; -exports.thumbnails = thumbnails; -const meta = async (file) => { - try { - return await sharp(file).metadata(); - } - catch (err) { - __1.logger.error(`Error retrieving meta data for ${file}`, err); - } -}; -exports.meta = meta; -const format = async (formats, options = { - cache: true, - png: false -}) => { - return await pMap(formats, async (format) => { - (0, dir_1.sync)(format.dist); - let files = glob.sync(format.src); - return await pMap(files, async (file) => { - let fileParts = path.parse(file); - const target = path.resolve(`${format.dist}/${fileParts.name}.${format.format}`); - if (options.cache !== false && (0, exists_1.sync)(target)) { - return; - } - const image = sharp(file).keepExif(); - const metadata = await image.metadata(); - if (options.png) { - await image - .withMetadata() - .png() - .toFile(target) - .catch(__1.logger.error); - } - else { - await image - .withMetadata() - .rotate() - .toFile(target) - .catch(__1.logger.error); - } - return metadata; - }); - }); -}; -exports.format = format; -const getResizePatterns = (product, folder, percent = 20) => { - return [ - { - src: `${product}/${folder}/${exports.GLOB_MIN}`, - dist: `${product}/${folder}/${percent}`, - percent - } - ]; -}; -exports.getResizePatterns = getResizePatterns; -const resize = async (patterns, options = { cache: true }) => { - return pMap(patterns, async (resize) => { - if (!fs.existsSync(resize.dist)) { - (0, dir_1.sync)(resize.dist); - } - let files = glob.sync(resize.src); - return await pMap(files, async (file) => { - let filename = path.basename(file); - if (options.cache && (0, exists_1.sync)(`${resize.dist}/${filename}`)) { - return; - } - try { - const image = sharp(file).keepExif().withMetadata(); - const metadata = await image.metadata(); - await image - .resize(Math.round(metadata.width * (resize.percent / 100))) - .keepExif() - .withMetadata() - .toFile(`${resize.dist}/${filename}`); - } - catch (err) { - __1.logger.error(err); - } - }); - }); -}; -exports.resize = resize; -const resizeSharp = async (patterns) => { - return await pMap(patterns, async (resize) => { - (0, dir_1.sync)(resize.dist); - let files = glob.sync(resize.src); - return await pMap(files, async (file) => { - let filename = path.basename(file); - const image = sharp(file); - const metadata = await image.metadata(); - if ((0, exists_1.sync)(`${resize.dist}/${filename}`)) { - return metadata; - } - try { - const metadata = await image.metadata(); - await image - .resize(Math.round(metadata.width * (resize.percent / 100))) - .toFile(`${resize.dist}/${filename}`); - return metadata; - } - catch (err) { - console.error(err); - } - }); - }); -}; -exports.resizeSharp = resizeSharp; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGliL21lZGlhL2ltYWdlcy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7OztBQUNBLDJDQUF3QjtBQUN4Qiw0Q0FBeUI7QUFDekIsOENBQTJCO0FBRTNCLDhCQUE2QjtBQUM3Qiw2QkFBNEI7QUFDNUIseUJBQXdCO0FBQ3hCLCtCQUE4QjtBQUU5QixrREFBc0Q7QUFDdEQsNENBQWtEO0FBRWxELE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUNoQyxNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUE7QUFFNUIsZ0NBQWlEO0FBQ2pELHdDQUF3QztBQUV4QyxrREFBa0Q7QUFDckMsUUFBQSxVQUFVLEdBQUcsd0JBQXdCLENBQUE7QUFFckMsUUFBQSxRQUFRLEdBQUcsK0JBQStCLENBQUE7QUFFdkQscUNBQWtEO0FBRTNDLE1BQU0sS0FBSyxHQUFHLENBQUMsR0FBRyxFQUFFLElBQUksRUFBRSxFQUFFLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUU7SUFDOUMsR0FBRyxFQUFFLElBQUk7SUFDVCxHQUFHLEVBQUUsR0FBRztJQUNSLFFBQVEsRUFBRSxJQUFJO0NBQ2pCLENBQUMsQ0FBQTtBQUpXLFFBQUEsS0FBSyxTQUloQjtBQUVLLE1BQU0sVUFBVSxHQUFHLENBQUMsR0FBRyxFQUFFLE1BQU0sRUFBRSxFQUFFO0lBQ3RDLE9BQU8sQ0FBQztZQUNKLEdBQUcsRUFBRSxHQUFHLEdBQUcsSUFBSSxNQUFNLElBQUksZ0JBQVEsRUFBRTtZQUNuQyxJQUFJLEVBQUUsR0FBRyxHQUFHLElBQUksTUFBTSxPQUFPO1lBQzdCLE1BQU0sRUFBRSxNQUFNO1NBQ2pCLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQTtBQU5ZLFFBQUEsVUFBVSxjQU10QjtBQUVNLE1BQU0sbUJBQW1CLEdB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 \ No newline at end of file +"use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __exportStar = (this && this.__exportStar) || function(m, exports) { + for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.resizeSharp = exports.resize = exports.getResizePatterns = exports.format = exports.meta = exports.thumbnails = exports.getThumbnailOptions = exports.getFormats = exports.files = exports.GLOB_MIN = exports.GLOB_BASIC = void 0; +__exportStar(require("./resize"), exports); +__exportStar(require("./convert"), exports); +__exportStar(require("./watermark"), exports); +const pMap = require("p-map"); +const path = require("path"); +const fs = require("fs"); +const sharp = require("sharp"); +const exists_1 = require("@plastichub/fs/exists"); +const dir_1 = require("@plastichub/fs/dir"); +const fg = require('fast-glob'); +const glob = require('glob'); +const __1 = require("../../.."); +const _cli_1 = require("../../../_cli"); +//https://www.lightgalleryjs.com/demos/responsive/ +exports.GLOB_BASIC = 'png|jpg|tiff|jpeg|webp'; +exports.GLOB_MIN = '*.{png,jpg,jpeg,PNG,JPG,JPEG}'; +const resize_1 = require("./resize"); +const files = (dir, glob) => fg.sync(glob, { + dot: true, + cwd: dir, + absolute: true +}); +exports.files = files; +const getFormats = (src, folder) => { + return [{ + src: `${src}/${folder}/${exports.GLOB_MIN}`, + dist: `${src}/${folder}/webp`, + format: 'webp', + }]; +}; +exports.getFormats = getFormats; +const getThumbnailOptions = (src, format) => { + return [{ + src: `${src}/${exports.GLOB_MIN}`, + dist: "${SRC_DIR}/${SRC_NAME}_thumb.${FORMAT}", + format + }]; +}; +exports.getThumbnailOptions = getThumbnailOptions; +const thumbnails = async (options) => { + options = (0, _cli_1.sanitize)(options); + debugger; + __1.logger.setSettings({ minLevel: options.logLevel }); + return await (0, resize_1.resize)(options); +}; +exports.thumbnails = thumbnails; +const meta = async (file) => { + try { + return await sharp(file).metadata(); + } + catch (err) { + __1.logger.error(`Error retrieving meta data for ${file}`, err); + } +}; +exports.meta = meta; +const format = async (formats, options = { + cache: true, + png: false +}) => { + return await pMap(formats, async (format) => { + (0, dir_1.sync)(format.dist); + let files = glob.sync(format.src); + return await pMap(files, async (file) => { + let fileParts = path.parse(file); + const target = path.resolve(`${format.dist}/${fileParts.name}.${format.format}`); + if (options.cache !== false && (0, exists_1.sync)(target)) { + return; + } + const image = sharp(file).keepExif(); + const metadata = await image.metadata(); + if (options.png) { + await image + .withMetadata() + .png() + .toFile(target) + .catch(__1.logger.error); + } + else { + await image + .withMetadata() + .rotate() + .toFile(target) + .catch(__1.logger.error); + } + return metadata; + }); + }); +}; +exports.format = format; +const getResizePatterns = (product, folder, percent = 20) => { + return [ + { + src: `${product}/${folder}/${exports.GLOB_MIN}`, + dist: `${product}/${folder}/${percent}`, + percent + } + ]; +}; +exports.getResizePatterns = getResizePatterns; +const resize = async (patterns, options = { cache: true }) => { + return pMap(patterns, async (resize) => { + if (!fs.existsSync(resize.dist)) { + (0, dir_1.sync)(resize.dist); + } + let files = glob.sync(resize.src); + return await pMap(files, async (file) => { + let filename = path.basename(file); + if (options.cache && (0, exists_1.sync)(`${resize.dist}/${filename}`)) { + return; + } + try { + const image = sharp(file).keepExif().withMetadata(); + const metadata = await image.metadata(); + await image + .resize(Math.round(metadata.width * (resize.percent / 100))) + .keepExif() + .withMetadata() + .toFile(`${resize.dist}/${filename}`); + } + catch (err) { + __1.logger.error(err); + } + }); + }); +}; +exports.resize = resize; +const resizeSharp = async (patterns) => { + return await pMap(patterns, async (resize) => { + (0, dir_1.sync)(resize.dist); + let files = glob.sync(resize.src); + return await pMap(files, async (file) => { + let filename = path.basename(file); + const image = sharp(file); + const metadata = await image.metadata(); + if ((0, exists_1.sync)(`${resize.dist}/${filename}`)) { + return metadata; + } + try { + const metadata = await image.metadata(); + await image + .resize(Math.round(metadata.width * (resize.percent / 100))) + .toFile(`${resize.dist}/${filename}`); + return metadata; + } + catch (err) { + console.error(err); + } + }); + }); +}; +exports.resizeSharp = resizeSharp; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGliL21lZGlhL2ltYWdlcy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7OztBQUNBLDJDQUF3QjtBQUN4Qiw0Q0FBeUI7QUFDekIsOENBQTJCO0FBRTNCLDhCQUE2QjtBQUM3Qiw2QkFBNEI7QUFDNUIseUJBQXdCO0FBQ3hCLCtCQUE4QjtBQUU5QixrREFBc0Q7QUFDdEQsNENBQWtEO0FBRWxELE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUNoQyxNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUE7QUFFNUIsZ0NBQWlEO0FBQ2pELHdDQUF3QztBQUV4QyxrREFBa0Q7QUFDckMsUUFBQSxVQUFVLEdBQUcsd0JBQXdCLENBQUE7QUFFckMsUUFBQSxRQUFRLEdBQUcsK0JBQStCLENBQUE7QUFFdkQscUNBQWtEO0FBRTNDLE1BQU0sS0FBSyxHQUFHLENBQUMsR0FBRyxFQUFFLElBQUksRUFBRSxFQUFFLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUU7SUFDOUMsR0FBRyxFQUFFLElBQUk7SUFDVCxHQUFHLEVBQUUsR0FBRztJQUNSLFFBQVEsRUFBRSxJQUFJO0NBQ2pCLENBQUMsQ0FBQTtBQUpXLFFBQUEsS0FBSyxTQUloQjtBQUVLLE1BQU0sVUFBVSxHQUFHLENBQUMsR0FBRyxFQUFFLE1BQU0sRUFBRSxFQUFFO0lBQ3RDLE9BQU8sQ0FBQztZQUNKLEdBQUcsRUFBRSxHQUFHLEdBQUcsSUFBSSxNQUFNLElBQUksZ0JBQVEsRUFBRTtZQUNuQyxJQUFJLEVBQUUsR0FBRyxHQUFHLElBQUksTUFBTSxPQUFPO1lBQzdCLE1BQU0sRUFBRSxNQUFNO1NBQ2pCLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQTtBQU5ZLFFBQUEsVUFBVSxjQU10QjtBQUVNLE1BQU0sbUJBQW1CLEdB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 \ No newline at end of file diff --git a/packages/media/lib/media/images/lib.d.ts b/packages/media/lib/media/images/lib.d.ts index 752bb633..299e9ae8 100644 --- a/packages/media/lib/media/images/lib.d.ts +++ b/packages/media/lib/media/images/lib.d.ts @@ -1,6 +1,5 @@ -/// -import * as sharp from 'sharp'; -export declare const fileAsBuffer: (path: string) => Buffer; -export declare const base64ToBuffer: (b64string: string) => Promise; -export declare const imageToBase64: (imagePath: string) => Promise; -export declare const meta: (file: any, image: sharp.Sharp) => Promise; +import * as sharp from 'sharp'; +export declare const fileAsBuffer: (path: string) => any; +export declare const base64ToBuffer: (b64string: string) => Promise; +export declare const imageToBase64: (imagePath: string) => Promise; +export declare const meta: (file: any, image: sharp.Sharp) => Promise; diff --git a/packages/media/lib/media/images/lib.js b/packages/media/lib/media/images/lib.js index 55566542..43d59691 100644 --- a/packages/media/lib/media/images/lib.js +++ b/packages/media/lib/media/images/lib.js @@ -1,36 +1,36 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.meta = exports.imageToBase64 = exports.base64ToBuffer = exports.fileAsBuffer = void 0; -const path = require("path"); -const fs = require("fs"); -const read_1 = require("@plastichub/fs/read"); -const __1 = require("../../.."); -const fileAsBuffer = (path) => (0, read_1.sync)(path, 'buffer') || Buffer.from("-"); -exports.fileAsBuffer = fileAsBuffer; -const base64ToBuffer = async (b64string) => Buffer.from(b64string, 'base64'); -exports.base64ToBuffer = base64ToBuffer; -const imageToBase64 = async (imagePath) => { - try { - const imageBuffer = await fs.promises.readFile(imagePath); - const imageBase64 = imageBuffer.toString('base64'); - const mimeType = path.extname(imagePath).slice(1); - const dataUri = `data:image/${mimeType};base64,${imageBase64}`; - return dataUri; - } - catch (error) { - throw new Error(`Failed to convert image to base64: ${error}`); - } -}; -exports.imageToBase64 = imageToBase64; -const meta = (file, image) => { - return new Promise((resolve) => { - image.metadata().then((meta) => { - resolve(meta); - }).catch((e) => { - __1.logger.error(`Error creating meta data ${file}`); - resolve(null); - }); - }); -}; -exports.meta = meta; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGliLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9tZWRpYS9pbWFnZXMvbGliLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZCQUE0QjtBQUM1Qix5QkFBd0I7QUFFeEIsOENBQWtEO0FBQ2xELGdDQUFpQztBQUUxQixNQUFNLFlBQVksR0FBRyxDQUFDLElBQVksRUFBRSxFQUFFLENBQUMsSUFBQSxXQUFJLEVBQUMsSUFBSSxFQUFFLFFBQVEsQ0FBVyxJQUFJLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUE7QUFBbkYsUUFBQSxZQUFZLGdCQUF1RTtBQUV6RixNQUFNLGNBQWMsR0FBRyxLQUFLLEVBQUUsU0FBaUIsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsUUFBUSxDQUFDLENBQUE7QUFBOUUsUUFBQSxjQUFjLGtCQUFnRTtBQUVwRixNQUFNLGFBQWEsR0FBRyxLQUFLLEVBQUUsU0FBaUIsRUFBbUIsRUFBRTtJQUN0RSxJQUFJO1FBQ0EsTUFBTSxXQUFXLEdBQUcsTUFBTSxFQUFFLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUMxRCxNQUFNLFdBQVcsR0FBRyxXQUFXLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ25ELE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ2xELE1BQU0sT0FBTyxHQUFHLGNBQWMsUUFBUSxXQUFXLFdBQVcsRUFBRSxDQUFDO1FBQy9ELE9BQU8sT0FBTyxDQUFDO0tBQ2xCO0lBQUMsT0FBTyxLQUFLLEVBQUU7UUFDWixNQUFNLElBQUksS0FBSyxDQUFDLHNDQUFzQyxLQUFLLEVBQUUsQ0FBQyxDQUFDO0tBQ2xFO0FBQ0wsQ0FBQyxDQUFBO0FBVlksUUFBQSxhQUFhLGlCQVV6QjtBQUVNLE1BQU0sSUFBSSxHQUFHLENBQUMsSUFBSSxFQUFFLEtBQWtCLEVBQWtDLEVBQUU7SUFDN0UsT0FBTyxJQUFJLE9BQU8sQ0FBQyxDQUFDLE9BQU8sRUFBRSxFQUFFO1FBQzNCLEtBQUssQ0FBQyxRQUFRLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtZQUMzQixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDakIsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7WUFDWCxVQUFNLENBQUMsS0FBSyxDQUFDLDRCQUE0QixJQUFJLEVBQUUsQ0FBQyxDQUFBO1lBQ2hELE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQTtRQUNqQixDQUFDLENBQUMsQ0FBQTtJQUNOLENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFBO0FBVFksUUFBQSxJQUFJLFFBU2hCIn0= \ No newline at end of file +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.meta = exports.imageToBase64 = exports.base64ToBuffer = exports.fileAsBuffer = void 0; +const path = require("path"); +const fs = require("fs"); +const read_1 = require("@plastichub/fs/read"); +const __1 = require("../../.."); +const fileAsBuffer = (path) => (0, read_1.sync)(path, 'buffer') || Buffer.from("-"); +exports.fileAsBuffer = fileAsBuffer; +const base64ToBuffer = async (b64string) => Buffer.from(b64string, 'base64'); +exports.base64ToBuffer = base64ToBuffer; +const imageToBase64 = async (imagePath) => { + try { + const imageBuffer = await fs.promises.readFile(imagePath); + const imageBase64 = imageBuffer.toString('base64'); + const mimeType = path.extname(imagePath).slice(1); + const dataUri = `data:image/${mimeType};base64,${imageBase64}`; + return dataUri; + } + catch (error) { + throw new Error(`Failed to convert image to base64: ${error}`); + } +}; +exports.imageToBase64 = imageToBase64; +const meta = (file, image) => { + return new Promise((resolve) => { + image.metadata().then((meta) => { + resolve(meta); + }).catch((e) => { + __1.logger.error(`Error creating meta data ${file}`); + resolve(null); + }); + }); +}; +exports.meta = meta; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGliLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9tZWRpYS9pbWFnZXMvbGliLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZCQUE0QjtBQUM1Qix5QkFBd0I7QUFFeEIsOENBQWtEO0FBQ2xELGdDQUFpQztBQUUxQixNQUFNLFlBQVksR0FBRyxDQUFDLElBQVksRUFBRSxFQUFFLENBQUMsSUFBQSxXQUFJLEVBQUMsSUFBSSxFQUFFLFFBQVEsQ0FBVyxJQUFJLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUE7QUFBbkYsUUFBQSxZQUFZLGdCQUF1RTtBQUV6RixNQUFNLGNBQWMsR0FBRyxLQUFLLEVBQUUsU0FBaUIsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsUUFBUSxDQUFDLENBQUE7QUFBOUUsUUFBQSxjQUFjLGtCQUFnRTtBQUVwRixNQUFNLGFBQWEsR0FBRyxLQUFLLEVBQUUsU0FBaUIsRUFBbUIsRUFBRTtJQUN0RSxJQUFJLENBQUM7UUFDRCxNQUFNLFdBQVcsR0FBRyxNQUFNLEVBQUUsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQzFELE1BQU0sV0FBVyxHQUFHLFdBQVcsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDbkQsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDbEQsTUFBTSxPQUFPLEdBQUcsY0FBYyxRQUFRLFdBQVcsV0FBVyxFQUFFLENBQUM7UUFDL0QsT0FBTyxPQUFPLENBQUM7SUFDbkIsQ0FBQztJQUFDLE9BQU8sS0FBSyxFQUFFLENBQUM7UUFDYixNQUFNLElBQUksS0FBSyxDQUFDLHNDQUFzQyxLQUFLLEVBQUUsQ0FBQyxDQUFDO0lBQ25FLENBQUM7QUFDTCxDQUFDLENBQUE7QUFWWSxRQUFBLGFBQWEsaUJBVXpCO0FBRU0sTUFBTSxJQUFJLEdBQUcsQ0FBQyxJQUFJLEVBQUUsS0FBa0IsRUFBa0MsRUFBRTtJQUM3RSxPQUFPLElBQUksT0FBTyxDQUFDLENBQUMsT0FBTyxFQUFFLEVBQUU7UUFDM0IsS0FBSyxDQUFDLFFBQVEsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO1lBQzNCLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQTtRQUNqQixDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtZQUNYLFVBQU0sQ0FBQyxLQUFLLENBQUMsNEJBQTRCLElBQUksRUFBRSxDQUFDLENBQUE7WUFDaEQsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFBO1FBQ2pCLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDLENBQUE7QUFUWSxRQUFBLElBQUksUUFTaEIifQ== \ No newline at end of file diff --git a/packages/media/lib/media/images/resize.d.ts b/packages/media/lib/media/images/resize.d.ts index ab07af32..d62340cc 100644 --- a/packages/media/lib/media/images/resize.d.ts +++ b/packages/media/lib/media/images/resize.d.ts @@ -1,5 +1,5 @@ -import * as sharp from 'sharp'; -import { IOptions, IResizeOptions } from '../../../index'; -export declare const resizeFile: (source: string, target: string, onNode: (data: sharp.Sharp) => void, options: IResizeOptions) => Promise; -export declare const _resize: (file: any, targets: string[], onNode: (data: any) => void, options: IOptions) => Promise<(void | sharp.Sharp)[]>; -export declare const resize: (options: IResizeOptions) => Promise; +import * as sharp from 'sharp'; +import { IOptions, IResizeOptions } from '../../../index'; +export declare const resizeFile: (source: string, target: string, onNode: (data: sharp.Sharp) => void, options: IResizeOptions) => Promise; +export declare const _resize: (file: any, targets: string[], onNode: (data: any) => void, options: IOptions) => Promise; +export declare const resize: (options: IResizeOptions) => Promise; diff --git a/packages/media/lib/media/images/resize.js b/packages/media/lib/media/images/resize.js index 9a9b0f27..db8e43ec 100644 --- a/packages/media/lib/media/images/resize.js +++ b/packages/media/lib/media/images/resize.js @@ -1,154 +1,154 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.resize = exports._resize = exports.resizeFile = void 0; -const path = require("path"); -const pMap = require("p-map"); -const sharp = require("sharp"); -const exists_1 = require("@plastichub/fs/exists"); -const move_1 = require("@plastichub/fs/move"); -const dir_1 = require("@plastichub/fs/dir"); -const inspect_1 = require("@plastichub/fs/inspect"); -const index_1 = require("../../../index"); -const lib_1 = require("./lib"); -const __1 = require("../.."); -const resizeFile = async (source, target, onNode = () => { }, options) => { - //const osr_cache = OSR_CACHE() - //const ca_options = JSON.parse(JSON.stringify({ ...options, target, skip: null })) - //const cached = await get_cached(file, ca_options, MODULE_NAME) - const targetOri = '' + target; - let inPlace = false; - if (path.resolve(source) === path.resolve(target)) { - const parts = path.parse(target); - target = path.join(parts.dir, parts.name + '_tmp' + parts.ext); - inPlace = true; - } - let image; - try { - image = sharp(source); - } - catch (e) { - index_1.logger.error(`Error reading file, ${source}`, e); - return; - } - onNode(image); - let metaData = await (0, lib_1.meta)(source, image) || {}; - const percent = options.percent; - const dstParts = path.parse(target); - const node = (0, inspect_1.createItem)(source, { - size: true, - mime: true - }); - if (!(0, exists_1.sync)(dstParts.dir)) { - (0, dir_1.sync)(dstParts.dir); - } - if (options.width && options.minWidth && options.width <= options.minWidth) { - index_1.logger.error(`Error resizing : options.width <= options.minWidth`); - return; - } - if (metaData.width && options.width && options.minWidth) { - if (metaData.width <= options.minWidth) { - return image; - } - } - if (metaData.height && options.height && options.minHeight) { - if (metaData.height <= options.minHeight) { - return image; - } - } - if (options.minSize && node.size && options.minSize >= node.size) { - return image; - } - const resizeOptions = { - height: options.height, - fastShrinkOnLoad: options.fastShrinkOnLoad, - withoutEnlargement: options.withoutEnlargement, - withoutReduction: options.withoutReduction, - fit: options.fit, - position: options.position, - background: options.background || 'white' - }; - if (percent && metaData.width) { - image = image.resize({ - width: Math.round(metaData.width * (percent / 100)), - ...resizeOptions - }); - } - else if (options.width || options.height) { - image = image.resize({ - width: options.width, - ...resizeOptions - }); - } - else { - index_1.logger.error(`Error resizing, invalid options for ${source} - no width, height or percent`); - return image; - } - if (dstParts.ext.toLowerCase() === '.webp' || - dstParts.ext.toLowerCase() === '.png') { - image = image.rotate(); - } - if (metaData.width) { - await image.withMetadata().toFile(target); - } - else { - try { - await image.toFile(target); - } - catch (e) { - index_1.logger.error(`Error writing file out, ${source}`, e); - return; - } - } - if (inPlace) { - const timeout = async (retry) => new Promise((resolve) => setTimeout(resolve, index_1.ERR_PERM_RETRY_DELAY * retry)); - const moveRetry = async (src, dst, retry = 0) => { - if (retry > index_1.ERR_PERM_RETRY_MAX) { - index_1.logger.error(`Error moving file failed, max retries reached ${src}`); - return; - } - try { - await (0, move_1.async)(target, targetOri); - } - catch (e) { - if (e.code === 'EPERM') { - index_1.logger.warn(`Error moving file out, retry ${source}`, e); - await timeout(retry); - moveRetry(src, dst, retry + 1); - } - } - }; - await moveRetry(source, targetOri); - } - index_1.logger.debug(`Resized Image ${source} to ${targetOri}`); - return image; -}; -exports.resizeFile = resizeFile; -const _resize = async (file, targets, onNode = () => { }, options) => { - return pMap(targets, async (target) => { - index_1.logger.debug(`Resizing ${file} to ${target}`); - if (options.dry) { - return Promise.resolve(); - } - return (0, exports.resizeFile)(file, target, onNode, options); - }, { concurrency: 1 }); -}; -exports._resize = _resize; -const resize = async (options) => { - let reports = []; - index_1.logger.setSettings({ minLevel: options.logLevel || 'info' }); - const onNode = (data) => reports.push(data); - if (options.srcInfo) { - index_1.logger.debug(`Convert ${options.srcInfo.FILES.length} files`); - return await pMap(options.srcInfo.FILES, async (f) => { - const outputs = (0, __1.targetsNext)(f, options); - index_1.logger.debug(`Convert ${f} to `, outputs); - return (0, exports._resize)(f, outputs, onNode, options); - }, { concurrency: 1 }); - } - else { - index_1.logger.error(`Invalid source info`); - } - return reports; -}; -exports.resize = resize; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzaXplLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9tZWRpYS9pbWFnZXMvcmVzaXplLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZCQUE0QjtBQUM1Qiw4QkFBNkI7QUFDN0IsK0JBQThCO0FBRTlCLGtEQUFzRDtBQUN0RCw4Q0FBbUQ7QUFDbkQsNENBQWdEO0FBQ2hELG9EQUE2RDtBQUU3RCwwQ0FNdUI7QUFFdkIsK0JBRWM7QUFFZCw2QkFHYztBQUdQLE1BQU0sVUFBVSxHQUFHLEtBQUssRUFBRSxNQUFjLEVBQUUsTUFBYyxFQUFFLFNBQXNDLEdBQUcsRUFBRSxHQUFHLENBQUMsRUFBRSxPQUF1QixFQUFvQyxFQUFFO0lBQzNLLCtCQUErQjtJQUMvQixtRkFBbUY7SUFDbkYsZ0VBQWdFO0lBQ2hFLE1BQU0sU0FBUyxHQUFHLEVBQUUsR0FBRyxNQUFNLENBQUE7SUFDN0IsSUFBSSxPQUFPLEdBQUcsS0FBSyxDQUFBO0lBQ25CLElBQUksSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQUFFO1FBQy9DLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUE7UUFDaEMsTUFBTSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxLQUFLLENBQUMsSUFBSSxHQUFHLE1BQU0sR0FBRyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDOUQsT0FBTyxHQUFHLElBQUksQ0FBQTtLQUNqQjtJQUVELElBQUksS0FBa0IsQ0FBQTtJQUN0QixJQUFJO1FBQ0EsS0FBSyxHQUFHLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQTtLQUN4QjtJQUFDLE9BQU8sQ0FBQyxFQUFFO1FBQ1IsY0FBTSxDQUFDLEtBQUssQ0FBQyx1QkFBdUIsTUFBTSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENB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 \ No newline at end of file +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.resize = exports._resize = exports.resizeFile = void 0; +const path = require("path"); +const pMap = require("p-map"); +const sharp = require("sharp"); +const exists_1 = require("@plastichub/fs/exists"); +const move_1 = require("@plastichub/fs/move"); +const dir_1 = require("@plastichub/fs/dir"); +const inspect_1 = require("@plastichub/fs/inspect"); +const index_1 = require("../../../index"); +const lib_1 = require("./lib"); +const __1 = require("../.."); +const resizeFile = async (source, target, onNode = () => { }, options) => { + //const osr_cache = OSR_CACHE() + //const ca_options = JSON.parse(JSON.stringify({ ...options, target, skip: null })) + //const cached = await get_cached(file, ca_options, MODULE_NAME) + const targetOri = '' + target; + let inPlace = false; + if (path.resolve(source) === path.resolve(target)) { + const parts = path.parse(target); + target = path.join(parts.dir, parts.name + '_tmp' + parts.ext); + inPlace = true; + } + let image; + try { + image = sharp(source); + } + catch (e) { + index_1.logger.error(`Error reading file, ${source}`, e); + return; + } + onNode(image); + let metaData = await (0, lib_1.meta)(source, image) || {}; + const percent = options.percent; + const dstParts = path.parse(target); + const node = (0, inspect_1.createItem)(source, { + size: true, + mime: true + }); + if (!(0, exists_1.sync)(dstParts.dir)) { + (0, dir_1.sync)(dstParts.dir); + } + if (options.width && options.minWidth && options.width <= options.minWidth) { + index_1.logger.error(`Error resizing : options.width <= options.minWidth`); + return; + } + if (metaData.width && options.width && options.minWidth) { + if (metaData.width <= options.minWidth) { + return image; + } + } + if (metaData.height && options.height && options.minHeight) { + if (metaData.height <= options.minHeight) { + return image; + } + } + if (options.minSize && node.size && options.minSize >= node.size) { + return image; + } + const resizeOptions = { + height: options.height, + fastShrinkOnLoad: options.fastShrinkOnLoad, + withoutEnlargement: options.withoutEnlargement, + withoutReduction: options.withoutReduction, + fit: options.fit, + position: options.position, + background: options.background || 'white' + }; + if (percent && metaData.width) { + image = image.resize({ + width: Math.round(metaData.width * (percent / 100)), + ...resizeOptions + }); + } + else if (options.width || options.height) { + image = image.resize({ + width: options.width, + ...resizeOptions + }); + } + else { + index_1.logger.error(`Error resizing, invalid options for ${source} - no width, height or percent`); + return image; + } + if (dstParts.ext.toLowerCase() === '.webp' || + dstParts.ext.toLowerCase() === '.png') { + image = image.rotate(); + } + if (metaData.width) { + await image.withMetadata().toFile(target); + } + else { + try { + await image.toFile(target); + } + catch (e) { + index_1.logger.error(`Error writing file out, ${source}`, e); + return; + } + } + if (inPlace) { + const timeout = async (retry) => new Promise((resolve) => setTimeout(resolve, index_1.ERR_PERM_RETRY_DELAY * retry)); + const moveRetry = async (src, dst, retry = 0) => { + if (retry > index_1.ERR_PERM_RETRY_MAX) { + index_1.logger.error(`Error moving file failed, max retries reached ${src}`); + return; + } + try { + await (0, move_1.async)(target, targetOri); + } + catch (e) { + if (e.code === 'EPERM') { + index_1.logger.warn(`Error moving file out, retry ${source}`, e); + await timeout(retry); + moveRetry(src, dst, retry + 1); + } + } + }; + await moveRetry(source, targetOri); + } + index_1.logger.debug(`Resized Image ${source} to ${targetOri}`); + return image; +}; +exports.resizeFile = resizeFile; +const _resize = async (file, targets, onNode = () => { }, options) => { + return pMap(targets, async (target) => { + index_1.logger.debug(`Resizing ${file} to ${target}`); + if (options.dry) { + return Promise.resolve(); + } + return (0, exports.resizeFile)(file, target, onNode, options); + }, { concurrency: 1 }); +}; +exports._resize = _resize; +const resize = async (options) => { + let reports = []; + index_1.logger.setSettings({ minLevel: options.logLevel || 'info' }); + const onNode = (data) => reports.push(data); + if (options.srcInfo) { + index_1.logger.debug(`Convert ${options.srcInfo.FILES.length} files`); + return await pMap(options.srcInfo.FILES, async (f) => { + const outputs = (0, __1.targetsNext)(f, options); + index_1.logger.debug(`Convert ${f} to `, outputs); + return (0, exports._resize)(f, outputs, onNode, options); + }, { concurrency: 1 }); + } + else { + index_1.logger.error(`Invalid source info`); + } + return reports; +}; +exports.resize = resize; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzaXplLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9tZWRpYS9pbWFnZXMvcmVzaXplLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZCQUE0QjtBQUM1Qiw4QkFBNkI7QUFDN0IsK0JBQThCO0FBRTlCLGtEQUFzRDtBQUN0RCw4Q0FBbUQ7QUFDbkQsNENBQWdEO0FBQ2hELG9EQUE2RDtBQUU3RCwwQ0FNdUI7QUFFdkIsK0JBRWM7QUFFZCw2QkFHYztBQUdQLE1BQU0sVUFBVSxHQUFHLEtBQUssRUFBRSxNQUFjLEVBQUUsTUFBYyxFQUFFLFNBQXNDLEdBQUcsRUFBRSxHQUFHLENBQUMsRUFBRSxPQUF1QixFQUFvQyxFQUFFO0lBQzNLLCtCQUErQjtJQUMvQixtRkFBbUY7SUFDbkYsZ0VBQWdFO0lBQ2hFLE1BQU0sU0FBUyxHQUFHLEVBQUUsR0FBRyxNQUFNLENBQUE7SUFDN0IsSUFBSSxPQUFPLEdBQUcsS0FBSyxDQUFBO0lBQ25CLElBQUksSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUM7UUFDaEQsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUNoQyxNQUFNLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxJQUFJLEdBQUcsTUFBTSxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUM5RCxPQUFPLEdBQUcsSUFBSSxDQUFBO0lBQ2xCLENBQUM7SUFFRCxJQUFJLEtBQWtCLENBQUE7SUFDdEIsSUFBSSxDQUFDO1FBQ0QsS0FBSyxHQUFHLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUN6QixDQUFDO0lBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztRQUNULGNBQU0sQ0FBQyxLQUFLLENBQUMsdUJBQXVCLE1BQU0sRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQ2hELE9BQU07SUFDVixDQUFDO0lBRUQsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQ2IsSUFBSSxRQUFRLEdBQVEsTUFBTSxJQUFBLFVBQUksRUFBQyxNQUFNLEVBQUUsS0FBSyxDQUFDLElBQUksRUFBRSxDQUFBO0lBQ25ELE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUE7SUFFL0IsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUNuQyxNQUFNLElBQUksR0FBRyxJQUFBLG9CQUFNLEVBQUMsTUFBTSxFQUFFO1FBQ3hCLElBQUksRUFBRSxJQUFJO1FBQ1YsSUFBSSxFQUFFLElBQUk7S0FDYixDQUFDLENBQUE7SUFDRixJQUFJLENBQUMsSUFBQSxhQUFNLEVBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDeEIsSUFBQSxVQUFHLEVBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQ3JCLENBQUM7SUFDRCxJQUFJLE9BQU8sQ0FBQyxLQUFLLElBQUksT0FBTyxDQUFDLFFBQVEsSUFBSSxPQUFPLENBQUMsS0FBSyxJQUFJLE9BQU8sQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUN6RSxjQUFNLENBQUMsS0FBSyxDQUFDLG9EQUFvRCxDQUFDLENBQUE7UUFDbEUsT0FBTTtJQUNWLENBQUM7SUFDRCxJQUFJLFFBQVEsQ0FBQyxLQUFLLElBQUksT0FBTyxDQUFDLEtBQUssSUFBSSxPQUFPLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDdEQsSUFBSSxRQUFRLENBQUMsS0FBSyxJQUFJLE9BQU8sQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUNyQyxPQUFPLEtBQUssQ0FBQTtRQUNoQixDQUFDO0lBQ0wsQ0FBQztJQUNELElBQUksUUFBUSxDQUFDLE1BQU0sSUFBSSxPQUFPLENBQUMsTUFBTSxJQUFJLE9BQU8sQ0FBQyxTQUFTLEVBQUUsQ0FBQztRQUN6RCxJQUFJLFFBQVEsQ0FBQyxNQUFNLElBQUksT0FBTyxDQUFDLFNBQVMsRUFBRSxDQUFDO1lBQ3ZDLE9BQU8sS0FBSyxDQUFBO1FBQ2hCLENBQUM7SUFDTCxDQUFDO0lBQ0QsSUFBSSxPQUFPLENBQUMsT0FBTyxJQUFJLElBQUksQ0FBQyxJQUFJLElBQUksT0FBTyxDQUFDLE9BQU8sSUFBSSxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDL0QsT0FBTyxLQUFLLENBQUE7SUFDaEIsQ0FBQztJQUNELE1BQU0sYUFBYSxHQUFHO1FBQ2xCLE1BQU0sRUFBRSxPQUFPLENBQUMsTUFBTTtRQUNsQixnQkFBZ0IsRUFBRSxPQUFPLENBQUMsZ0JBQWdCO1FBQzFDLGtCQUFrQixFQUFFLE9BQU8sQ0FBQyxrQkFBa0I7UUFDOUMsZ0JBQWdCLEVBQUUsT0FBTyxDQUFDLGdCQUFnQjtRQUMxQyxHQUFHLEVBQUUsT0FBTyxDQUFDLEdBQUc7UUFDaEIsUUFBUSxFQUFFLE9BQU8sQ0FBQyxRQUFRO1FBQzFCLFVBQVUsRUFBRSxPQUFPLENBQUMsVUFBVSxJQUFJLE9BQU87S0FDaEQsQ0FBQTtJQUNELElBQUksT0FBTyxJQUFJLFFBQVEsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUM1QixLQUFLLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FBQztZQUNqQixLQUFLLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsS0FBSyxHQUFHLENBQUMsT0FBTyxHQUFHLEdBQUcsQ0FBQyxDQUFDO1lBQ25ELEdBQUcsYUFBYTtTQUVuQixDQUFDLENBQUE7SUFFTixDQUFDO1NBQU0sSUFBSSxPQUFPLENBQUMsS0FBSyxJQUFJLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUN6QyxLQUFLLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FBQztZQUNqQixLQUFLLEVBQUUsT0FBTyxDQUFDLEtBQUs7WUFDcEIsR0FBRyxhQUFhO1NBQ25CLENBQUMsQ0FBQTtJQUNOLENBQUM7U0FBTSxDQUFDO1FBQ0osY0FBTSxDQUFDLEtBQUssQ0FBQyx1Q0FBdUMsTUFBTSxnQ0FBZ0MsQ0FBQyxDQUFBO1FBQzNGLE9BQU8sS0FBSyxDQUFBO0lBQ2hCLENBQUM7SUFFRCxJQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUMsV0FBVyxFQUFFLEtBQUssT0FBTztRQUNyQyxRQUFRLENBQUMsR0FBRyxDQUFDLFdBQVcsRUFBRSxLQUFLLE1BQU0sRUFBRSxDQUFDO1FBQ3hDLEtBQUssR0FBRyxLQUFLLENBQUMsTUFBTSxFQUFFLENBQUE7SUFDMUIsQ0FBQztJQUVELElBQUksUUFBUSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ2pCLE1BQU0sS0FBSyxDQUFDLFlBQVksRUFBRSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUM3QyxDQUFDO1NBQU0sQ0FBQztRQUNKLElBQUksQ0FBQztZQUNELE1BQU0sS0FBSyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUM5QixDQUFDO1FBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztZQUNULGNBQU0sQ0FBQyxLQUFLLENBQUMsMkJBQTJCLE1BQU0sRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFBO1lBQ3BELE9BQU07UUFDVixDQUFDO0lBQ0wsQ0FBQztJQUVELElBQUksT0FBTyxFQUFFLENBQUM7UUFDVixNQUFNLE9BQU8sR0FBRyxLQUFLLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQ3JELFVBQVUsQ0FBQyxPQUFPLEVBQUUsNEJBQW9CLEdBQUcsS0FBSyxDQUFDLENBQ3BELENBQUE7UUFDRCxNQUFNLFNBQVMsR0FBRyxLQUFLLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxLQUFLLEdBQUcsQ0FBQyxFQUFFLEVBQUU7WUFDNUMsSUFBSSxLQUFLLEdBQUcsMEJBQWtCLEVBQUUsQ0FBQztnQkFDN0IsY0FBTSxDQUFDLEtBQUssQ0FBQyxpREFBaUQsR0FBRyxFQUFFLENBQUMsQ0FBQTtnQkFDcEUsT0FBTTtZQUNWLENBQUM7WUFDRCxJQUFJLENBQUM7Z0JBQ0QsTUFBTSxJQUFBLFlBQUksRUFBQyxNQUFNLEVBQUUsU0FBUyxDQUFDLENBQUE7WUFDakMsQ0FBQztZQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7Z0JBQ1QsSUFBSSxDQUFDLENBQUMsSUFBSSxLQUFLLE9BQU8sRUFBRSxDQUFDO29CQUNyQixjQUFNLENBQUMsSUFBSSxDQUFDLGdDQUFnQyxNQUFNLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQTtvQkFDeEQsTUFBTSxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUE7b0JBQ3BCLFNBQVMsQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFLEtBQUssR0FBRyxDQUFDLENBQUMsQ0FBQTtnQkFDbEMsQ0FBQztZQUNMLENBQUM7UUFDTCxDQUFDLENBQUE7UUFDRCxNQUFNLFNBQVMsQ0FBQyxNQUFNLEVBQUUsU0FBUyxDQUFDLENBQUE7SUFDdEMsQ0FBQztJQUNELGNBQU0sQ0FBQyxLQUFLLENBQUMsaUJBQWlCLE1BQU0sT0FBTyxTQUFTLEVBQUUsQ0FBQyxDQUFBO0lBQ3ZELE9BQU8sS0FBSyxDQUFBO0FBQ2hCLENBQUMsQ0FBQTtBQWxIWSxRQUFBLFVBQVUsY0FrSHRCO0FBQ00sTUFBTSxPQUFPLEdBQUcsS0FBSyxFQUFFLElBQUksRUFBRSxPQUFpQixFQUFFLFNBQThCLEdBQUcsRUFBRSxHQUFHLENBQUMsRUFBRSxPQUFpQixFQUFFLEVBQUU7SUFDakgsT0FBTyxJQUFJLENBQUMsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsRUFBRTtRQUNsQyxjQUFNLENBQUMsS0FBSyxDQUFDLFlBQVksSUFBSSxPQUFPLE1BQU0sRUFBRSxDQUFDLENBQUE7UUFDN0MsSUFBSSxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUM7WUFDZCxPQUFPLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQTtRQUM1QixDQUFDO1FBQ0QsT0FBTyxJQUFBLGtCQUFVLEVBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDckQsQ0FBQyxFQUFFLEVBQUUsV0FBVyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUE7QUFDMUIsQ0FBQyxDQUFBO0FBUlksUUFBQSxPQUFPLFdBUW5CO0FBQ00sTUFBTSxNQUFNLEdBQUcsS0FBSyxFQUFFLE9BQXVCLEVBQUUsRUFBRTtJQUNwRCxJQUFJLE9BQU8sR0FBUSxFQUFFLENBQUE7SUFDckIsY0FBTSxDQUFDLFdBQVcsQ0FBQyxFQUFFLFFBQVEsRUFBRSxPQUFPLENBQUMsUUFBUSxJQUFJLE1BQWEsRUFBRSxDQUFDLENBQUE7SUFDbkUsTUFBTSxNQUFNLEdBQUcsQ0FBQyxJQUFTLEVBQUUsRUFBRSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDaEQsSUFBSSxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDbEIsY0FBTSxDQUFDLEtBQUssQ0FBQyxXQUFXLE9BQU8sQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLE1BQU0sUUFBUSxDQUFDLENBQUE7UUFDN0QsT0FBTyxNQUFNLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxLQUFLLEVBQUUsQ0FBQyxFQUFFLEVBQUU7WUFDakQsTUFBTSxPQUFPLEdBQUcsSUFBQSxlQUFXLEVBQUMsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUFBO1lBQ3ZDLGNBQU0sQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsQ0FBQTtZQUN6QyxPQUFPLElBQUEsZUFBTyxFQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLE9BQU8sQ0FBQyxDQUFBO1FBQy9DLENBQUMsRUFBRSxFQUFFLFdBQVcsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFBO0lBQzFCLENBQUM7U0FBTSxDQUFDO1FBQ0osY0FBTSxDQUFDLEtBQUssQ0FBQyxxQkFBcUIsQ0FBQyxDQUFBO0lBQ3ZDLENBQUM7SUFDRCxPQUFPLE9BQU8sQ0FBQTtBQUNsQixDQUFDLENBQUE7QUFmWSxRQUFBLE1BQU0sVUFlbEIifQ== \ No newline at end of file diff --git a/packages/media/lib/media/images/watermark.d.ts b/packages/media/lib/media/images/watermark.d.ts index a3adeaf4..fab23d6a 100644 --- a/packages/media/lib/media/images/watermark.d.ts +++ b/packages/media/lib/media/images/watermark.d.ts @@ -1,2 +1,2 @@ -import { IOptions } from '../../../types'; -export declare const watermark: (options: IOptions) => Promise; +import { IOptions } from '../../../types'; +export declare const watermark: (options: IOptions) => Promise; diff --git a/packages/media/lib/media/images/watermark.js b/packages/media/lib/media/images/watermark.js index b1360c92..4a8b92b2 100644 --- a/packages/media/lib/media/images/watermark.js +++ b/packages/media/lib/media/images/watermark.js @@ -1,52 +1,52 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.watermark = void 0; -const bluebird = require("bluebird"); -const bluebird_1 = require("bluebird"); -const write_1 = require("@plastichub/fs/write"); -const index_1 = require("../../../index"); -const lib_1 = require("./lib"); -const novita_sdk_1 = require("novita-sdk"); -const __1 = require("../../"); -const removeWatermark = async (file, target, onNode = () => { }, options) => { - const novitaClient = new novita_sdk_1.NovitaSDK(options.key); - const params = { - image_file: await (0, lib_1.imageToBase64)(file) - //"data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD", - }; - try { - const wMark = await novitaClient.removeWatermark(params); - index_1.logger.info(`Watermark removed: ${file} to ${target}`); - (0, write_1.async)(target, (0, lib_1.base64ToBuffer)(wMark.image_file)); - } - catch (error) { - index_1.logger.error(`Failed to remove watermark: ${error.msg}`); - } -}; -const _watermark = async (file, targets, onNode = () => { }, options) => { - return bluebird_1.Promise.resolve(targets).map((target) => { - options.verbose && index_1.logger.debug(`Removing Watermark ${file} to ${target}`); - if (options.dry) { - return bluebird.resolve(); - } - return removeWatermark(file, target, onNode, options); - }, { concurrency: 1 }); -}; -const watermark = async (options) => { - // reporting, stub - let reports = []; - const onNode = (data) => reports.push(data); - if (options.srcInfo) { - options.verbose && index_1.logger.info(`Convert ${options.srcInfo.FILES.length} files`); - return await bluebird_1.Promise.resolve(options.srcInfo.FILES).map((f) => { - const outputs = (0, __1.targets)(f, options); - options.verbose && index_1.logger.info(`Convert ${f} to `, outputs); - return _watermark(f, outputs, onNode, options); - }, { concurrency: 1 }); - } - else { - options.debug && index_1.logger.error(`Invalid source info`); - } -}; -exports.watermark = watermark; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2F0ZXJtYXJrLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9tZWRpYS9pbWFnZXMvd2F0ZXJtYXJrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUdBLHFDQUFvQztBQUNwQyx1Q0FBOEM7QUFLOUMsZ0RBQXFEO0FBS3JELDBDQUV1QjtBQU92QiwrQkFHYztBQU1kLDJDQUFzQztBQUN0Qyw4QkFBOEM7QUFFOUMsTUFBTSxlQUFlLEdBQUcsS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsU0FBOEIsR0FBRyxFQUFFLEdBQUcsQ0FBQyxFQUFFLE9BQXVCLEVBQUUsRUFBRTtJQUM3RyxNQUFNLFlBQVksR0FBRyxJQUFJLHNCQUFTLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQy9DLE1BQU0sTUFBTSxHQUFHO1FBQ1gsVUFBVSxFQUFFLE1BQU0sSUFBQSxtQkFBYSxFQUFDLElBQUksQ0FBQztRQUNyQyx1REFBdUQ7S0FDMUQsQ0FBQTtJQUNELElBQUk7UUFDQSxNQUFNLEtBQUssR0FBRyxNQUFNLFlBQVksQ0FBQyxlQUFlLENBQUMsTUFBTSxDQUFDLENBQUE7UUFDeEQsY0FBTSxDQUFDLElBQUksQ0FBQyxzQkFBc0IsSUFBSSxPQUFPLE1BQU0sRUFBRSxDQUFDLENBQUE7UUFDdEQsSUFBQSxhQUFLLEVBQUMsTUFBTSxFQUFDLElBQUEsb0JBQWMsRUFBQyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQTtLQUNqRDtJQUFDLE9BQU8sS0FBSyxFQUFFO1FBQ1osY0FBTSxDQUFDLEtBQUssQ0FBQywrQkFBK0IsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUE7S0FDM0Q7QUFDTCxDQUFDLENBQUE7QUFFRCxNQUFNLFVBQVUsR0FBRyxLQUFLLEVBQUUsSUFBSSxFQUFFLE9BQWlCLEVBQUUsU0FBOEIsR0FBRyxFQUFFLEdBQUcsQ0FBQyxFQUFFLE9BQWlCLEVBQUUsRUFBRTtJQUM3RyxPQUFPLGtCQUFRLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFO1FBQzVDLE9BQU8sQ0FBQyxPQUFPLElBQUksY0FBTSxDQUFDLEtBQUssQ0FBQyxzQkFBc0IsSUFBSSxPQUFPLE1BQU0sRUFBRSxDQUFDLENBQUE7UUFDMUUsSUFBSSxPQUFPLENBQUMsR0FBRyxFQUFFO1lBQ2IsT0FBTyxRQUFRLENBQUMsT0FBTyxFQUFFLENBQUE7U0FDNUI7UUFDRCxPQUFPLGVBQWUsQ0FBQyxJQUFJLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxPQUFPLENBQUMsQ0FBQztJQUMxRCxDQUFDLEVBQUUsRUFBRSxXQUFXLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQTtBQUMxQixDQUFDLENBQUE7QUFFTSxNQUFNLFNBQVMsR0FBRyxLQUFLLEVBQUUsT0FBaUIsRUFBRSxFQUFFO0lBRWpELGtCQUFrQjtJQUNsQixJQUFJLE9BQU8sR0FBUSxFQUFFLENBQUE7SUFDckIsTUFBTSxNQUFNLEdBQUcsQ0FBQyxJQUFTLEVBQUUsRUFBRSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDaEQsSUFBSSxPQUFPLENBQUMsT0FBTyxFQUFFO1FBQ2pCLE9BQU8sQ0FBQyxPQUFPLElBQUksY0FBTSxDQUFDLElBQUksQ0FBQyxXQUFXLE9BQU8sQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLE1BQU0sUUFBUSxDQUFDLENBQUE7UUFDL0UsT0FBTyxNQUFNLGtCQUFRLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7WUFDM0QsTUFBTSxPQUFPLEdBQUcsSUFBQSxXQUFPLEVBQUMsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUFBO1lBQ25DLE9BQU8sQ0FBQyxPQUFPLElBQUksY0FBTSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxDQUFBO1lBQzNELE9BQU8sVUFBVSxDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLE9BQU8sQ0FBQyxDQUFBO1FBQ2xELENBQUMsRUFBRSxFQUFFLFdBQVcsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFBO0tBQ3pCO1NBQU07UUFDSCxPQUFPLENBQUMsS0FBSyxJQUFJLGNBQU0sQ0FBQyxLQUFLLENBQUMscUJBQXFCLENBQUMsQ0FBQTtLQUN2RDtBQUNMLENBQUMsQ0FBQTtBQWZZLFFBQUEsU0FBUyxhQWVyQiJ9 \ No newline at end of file +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.watermark = void 0; +const bluebird = require("bluebird"); +const bluebird_1 = require("bluebird"); +const write_1 = require("@plastichub/fs/write"); +const index_1 = require("../../../index"); +const lib_1 = require("./lib"); +const novita_sdk_1 = require("novita-sdk"); +const __1 = require("../../"); +const removeWatermark = async (file, target, onNode = () => { }, options) => { + const novitaClient = new novita_sdk_1.NovitaSDK(options.key); + const params = { + image_file: await (0, lib_1.imageToBase64)(file) + //"data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD", + }; + try { + const wMark = await novitaClient.removeWatermark(params); + index_1.logger.info(`Watermark removed: ${file} to ${target}`); + (0, write_1.async)(target, (0, lib_1.base64ToBuffer)(wMark.image_file)); + } + catch (error) { + index_1.logger.error(`Failed to remove watermark: ${error.msg}`); + } +}; +const _watermark = async (file, targets, onNode = () => { }, options) => { + return bluebird_1.Promise.resolve(targets).map((target) => { + options.verbose && index_1.logger.debug(`Removing Watermark ${file} to ${target}`); + if (options.dry) { + return bluebird.resolve(); + } + return removeWatermark(file, target, onNode, options); + }, { concurrency: 1 }); +}; +const watermark = async (options) => { + // reporting, stub + let reports = []; + const onNode = (data) => reports.push(data); + if (options.srcInfo) { + options.verbose && index_1.logger.info(`Convert ${options.srcInfo.FILES.length} files`); + return await bluebird_1.Promise.resolve(options.srcInfo.FILES).map((f) => { + const outputs = (0, __1.targets)(f, options); + options.verbose && index_1.logger.info(`Convert ${f} to `, outputs); + return _watermark(f, outputs, onNode, options); + }, { concurrency: 1 }); + } + else { + options.debug && index_1.logger.error(`Invalid source info`); + } +}; +exports.watermark = watermark; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2F0ZXJtYXJrLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9tZWRpYS9pbWFnZXMvd2F0ZXJtYXJrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUdBLHFDQUFvQztBQUNwQyx1Q0FBOEM7QUFLOUMsZ0RBQXFEO0FBS3JELDBDQUV1QjtBQU92QiwrQkFHYztBQU1kLDJDQUFzQztBQUN0Qyw4QkFBOEM7QUFFOUMsTUFBTSxlQUFlLEdBQUcsS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsU0FBOEIsR0FBRyxFQUFFLEdBQUcsQ0FBQyxFQUFFLE9BQXVCLEVBQUUsRUFBRTtJQUM3RyxNQUFNLFlBQVksR0FBRyxJQUFJLHNCQUFTLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQy9DLE1BQU0sTUFBTSxHQUFHO1FBQ1gsVUFBVSxFQUFFLE1BQU0sSUFBQSxtQkFBYSxFQUFDLElBQUksQ0FBQztRQUNyQyx1REFBdUQ7S0FDMUQsQ0FBQTtJQUNELElBQUksQ0FBQztRQUNELE1BQU0sS0FBSyxHQUFHLE1BQU0sWUFBWSxDQUFDLGVBQWUsQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUN4RCxjQUFNLENBQUMsSUFBSSxDQUFDLHNCQUFzQixJQUFJLE9BQU8sTUFBTSxFQUFFLENBQUMsQ0FBQTtRQUN0RCxJQUFBLGFBQUssRUFBQyxNQUFNLEVBQUMsSUFBQSxvQkFBYyxFQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFBO0lBQ2xELENBQUM7SUFBQyxPQUFPLEtBQUssRUFBRSxDQUFDO1FBQ2IsY0FBTSxDQUFDLEtBQUssQ0FBQywrQkFBK0IsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUE7SUFDNUQsQ0FBQztBQUNMLENBQUMsQ0FBQTtBQUVELE1BQU0sVUFBVSxHQUFHLEtBQUssRUFBRSxJQUFJLEVBQUUsT0FBaUIsRUFBRSxTQUE4QixHQUFHLEVBQUUsR0FBRyxDQUFDLEVBQUUsT0FBaUIsRUFBRSxFQUFFO0lBQzdHLE9BQU8sa0JBQVEsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxFQUFFLEVBQUU7UUFDNUMsT0FBTyxDQUFDLE9BQU8sSUFBSSxjQUFNLENBQUMsS0FBSyxDQUFDLHNCQUFzQixJQUFJLE9BQU8sTUFBTSxFQUFFLENBQUMsQ0FBQTtRQUMxRSxJQUFJLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUNkLE9BQU8sUUFBUSxDQUFDLE9BQU8sRUFBRSxDQUFBO1FBQzdCLENBQUM7UUFDRCxPQUFPLGVBQWUsQ0FBQyxJQUFJLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxPQUFPLENBQUMsQ0FBQztJQUMxRCxDQUFDLEVBQUUsRUFBRSxXQUFXLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQTtBQUMxQixDQUFDLENBQUE7QUFFTSxNQUFNLFNBQVMsR0FBRyxLQUFLLEVBQUUsT0FBaUIsRUFBRSxFQUFFO0lBRWpELGtCQUFrQjtJQUNsQixJQUFJLE9BQU8sR0FBUSxFQUFFLENBQUE7SUFDckIsTUFBTSxNQUFNLEdBQUcsQ0FBQyxJQUFTLEVBQUUsRUFBRSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDaEQsSUFBSSxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDbEIsT0FBTyxDQUFDLE9BQU8sSUFBSSxjQUFNLENBQUMsSUFBSSxDQUFDLFdBQVcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsTUFBTSxRQUFRLENBQUMsQ0FBQTtRQUMvRSxPQUFPLE1BQU0sa0JBQVEsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtZQUMzRCxNQUFNLE9BQU8sR0FBRyxJQUFBLFdBQU8sRUFBQyxDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUE7WUFDbkMsT0FBTyxDQUFDLE9BQU8sSUFBSSxjQUFNLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUE7WUFDM0QsT0FBTyxVQUFVLENBQUMsQ0FBQyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUE7UUFDbEQsQ0FBQyxFQUFFLEVBQUUsV0FBVyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUE7SUFDMUIsQ0FBQztTQUFNLENBQUM7UUFDSixPQUFPLENBQUMsS0FBSyxJQUFJLGNBQU0sQ0FBQyxLQUFLLENBQUMscUJBQXFCLENBQUMsQ0FBQTtJQUN4RCxDQUFDO0FBQ0wsQ0FBQyxDQUFBO0FBZlksUUFBQSxTQUFTLGFBZXJCIn0= \ No newline at end of file diff --git a/packages/media/lib/media/video/convert.d.ts b/packages/media/lib/media/video/convert.d.ts index faa7ccac..a28f6642 100644 --- a/packages/media/lib/media/video/convert.d.ts +++ b/packages/media/lib/media/video/convert.d.ts @@ -1,23 +1,23 @@ -import { IConvertVideoOptions } from '../../../types'; -import { E_AudioCodec, E_Codec, E_Format } from '../video'; -export declare const frames: (src: any, dst: any, onNode: any, options?: { - fps: number; -}) => Promise; -export declare const CONVERTERS: { - '.mp3': (inputPath: string, outputPath: string) => Promise; - '.jpg': (src: any, dst: any, onNode: any, options?: { - fps: number; - }) => Promise; -}; -export declare const converter: (file: string) => any; -export declare const convertFile: (file: any, target: any, onNode: (data: any) => void, options: IConvertVideoOptions) => Promise; -export declare function _convert(file: any, targets: string[], onNode: (data: any) => void, options: IConvertVideoOptions): Promise; -export declare const convert: (options: IConvertVideoOptions) => Promise; -export declare const merge: (options: IConvertVideoOptions) => Promise; -export interface VideoOptions { - frameRate?: number; - videoCodec?: keyof typeof E_Codec; - audioCodec?: keyof typeof E_AudioCodec; - format?: keyof typeof E_Format; -} -export declare const createVideoFromImages: (src: string, target: any, onNode: any, audio: any, { frameRate, videoCodec, audioCodec, format, }: VideoOptions) => Promise; +import { IConvertVideoOptions } from '../../../types'; +import { E_AudioCodec, E_Codec, E_Format } from '../video'; +export declare const frames: (src: any, dst: any, onNode: any, options?: { + fps: number; +}) => Promise; +export declare const CONVERTERS: { + '.mp3': (inputPath: string, outputPath: string) => Promise; + '.jpg': (src: any, dst: any, onNode: any, options?: { + fps: number; + }) => Promise; +}; +export declare const converter: (file: string) => any; +export declare const convertFile: (file: any, target: any, onNode: (data: any) => void, options: IConvertVideoOptions) => Promise; +export declare function _convert(file: any, targets: string[], onNode: (data: any) => void, options: IConvertVideoOptions): Promise; +export declare const convert: (options: IConvertVideoOptions) => Promise; +export declare const merge: (options: IConvertVideoOptions) => Promise; +export interface VideoOptions { + frameRate?: number; + videoCodec?: keyof typeof E_Codec; + audioCodec?: keyof typeof E_AudioCodec; + format?: keyof typeof E_Format; +} +export declare const createVideoFromImages: (src: string, target: any, onNode: any, audio: any, { frameRate, videoCodec, audioCodec, format, }: VideoOptions) => Promise; diff --git a/packages/media/lib/media/video/convert.js b/packages/media/lib/media/video/convert.js index 5ca4cb71..efecc3f3 100644 --- a/packages/media/lib/media/video/convert.js +++ b/packages/media/lib/media/video/convert.js @@ -1,130 +1,130 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.createVideoFromImages = exports.merge = exports.convert = exports._convert = exports.convertFile = exports.converter = exports.CONVERTERS = exports.frames = void 0; -const path = require("path"); -const pMap = require("p-map"); -const osr_commons_1 = require("@plastichub/osr-commons"); -const exists_1 = require("@plastichub/fs/exists"); -const dir_1 = require("@plastichub/fs/dir"); -const lib_1 = require("@plastichub/osr-cache/lib"); -const __1 = require("../../"); -const __2 = require("../../.."); -const constants_1 = require("../../../constants"); -const video_1 = require("../video"); -const FfmpegCommand = require('fluent-ffmpeg'); -const extension = (file) => path.parse(file).ext; -const mp3 = async (inputPath, outputPath) => { - return new Promise((resolve, reject) => { - const ff = new FfmpegCommand(inputPath); - ff.noVideo() - .audioCodec('libmp3lame') - .format('mp3') - .on('end', () => { - resolve(); - }) - .on('error', (error) => { - reject(error); - }) - .save(outputPath); - }); -}; -const frames = async (src, dst, onNode, options = { fps: 60 }) => { - const outputDir = path.dirname(dst); - if (!(0, exists_1.sync)(outputDir)) { - (0, dir_1.sync)(outputDir); - } - return new Promise((resolve, reject) => { - const ff = new FfmpegCommand(src); - ff.outputOptions([`-vf fps=${options.fps}`]) - .output(dst) - .on('end', () => { - resolve(); - }) - .on('error', (err) => { - reject(err); - }) - .run(); - }); -}; -exports.frames = frames; -exports.CONVERTERS = { - '.mp3': mp3, - '.jpg': exports.frames, -}; -const converter = (file) => exports.CONVERTERS[extension(file)]; -exports.converter = converter; -const convertFile = async (file, target, onNode = () => { }, options) => { - const osr_cache = (0, osr_commons_1.OSR_CACHE)(); - const ca_options = JSON.parse(JSON.stringify({ ...options, target, skip: null })); - const cached = await (0, lib_1.get_cached)(file, ca_options, constants_1.MODULE_NAME); - const conv = (0, exports.converter)(target); - if (!conv) { - __2.logger.error(`No converter found for ${file}`); - return; - } - const dstParts = path.parse(target); - if (!(0, exists_1.sync)(dstParts.dir)) { - (0, dir_1.sync)(dstParts.dir); - } - const ret = await conv(file, target, onNode, options); - return ret; -}; -exports.convertFile = convertFile; -async function _convert(file, targets, onNode = () => { }, options) { - return pMap(targets, (target) => { - options.verbose && __2.logger.debug(`Convert ${file} to ${target}`); - if (options.dry) { - return; - } - return (0, exports.convertFile)(file, target, onNode, options); - }, { concurrency: 1 }); -} -exports._convert = _convert; -const convert = async (options) => { - let reports = []; - const onNode = (data) => { reports.push(data); }; - options.verbose && __2.logger.info(`Convert ${options.srcInfo.FILES.length} files `); - await pMap(options.srcInfo.FILES, (f) => { - const outputs = (0, __1.targets)(f, options); - options.verbose && __2.logger.info(`Convert ${f} to `, outputs); - return _convert(f, outputs, onNode, options); - }, { concurrency: 1 }); -}; -exports.convert = convert; -//ffmpeg -r 30 -i tt-1-audio.mp3 -i tt-1-%03d.jpg out.mp4 -const merge = async (options) => { - let reports = []; - const onNode = (data) => { reports.push(data); }; - __2.logger.info(`Merge ${options.srcInfo.FILES.length} files `); - return await (0, exports.createVideoFromImages)(options.srcInfo.PATH, options.dst, onNode, options.audio, {}); -}; -exports.merge = merge; -const createVideoFromImages = async (src, target, onNode, audio, { frameRate = 30, videoCodec = 'LIBX264', audioCodec = 'AAC', format = 'MP4', }) => { - return new Promise((resolve, reject) => { - const dstParts = path.parse(target); - if (!(0, exists_1.sync)(dstParts.dir)) { - (0, dir_1.sync)(dstParts.dir); - } - const ff = new FfmpegCommand(src); - //src.forEach((file) => ff.input(file)) - ff.inputOptions('-framerate', 24); - ff.inputOptions('-pattern_type', 'glob'); - ff.on('progress', (err) => { - __2.logger.debug('progress:', err); - }).on('error', (err) => { - __2.logger.error('Error:', err); - }).on('end', () => { - __2.logger.info('Video has been created successfully.'); - resolve(ff); - }); - audio && ff.addInput(audio); - ff.videoCodec(video_1.E_Codec[videoCodec]) - .output(target) - //.outputOptions(['-pix_fmt yuv420p']) - //.audioCodec(E_AudioCodec[audioCodec]) - .format(video_1.E_Format[format]) - .run(); - }); -}; -exports.createVideoFromImages = createVideoFromImages; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udmVydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9saWIvbWVkaWEvdmlkZW8vY29udmVydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2QkFBNEI7QUFDNUIsOEJBQTZCO0FBQzdCLHlEQUFtRDtBQUNuRCxrREFBc0Q7QUFDdEQsNENBQWdEO0FBQ2hELG1EQUFzRDtBQUd0RCw4QkFBZ0M7QUFDaEMsZ0NBQWlDO0FBQ2pDLGtEQUFnRDtBQUVoRCxvQ0FBMEQ7QUFFMUQsTUFBTSxhQUFhLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFBO0FBRTlDLE1BQU0sU0FBUyxHQUFHLENBQUMsSUFBWSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLEdBQUcsQ0FBQTtBQUN4RCxNQUFNLEdBQUcsR0FBRyxLQUFLLEVBQUUsU0FBaUIsRUFBRSxVQUFrQixFQUFpQixFQUFFO0lBQ3ZFLE9BQU8sSUFBSSxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7UUFDbkMsTUFBTSxFQUFFLEdBQUcsSUFBSSxhQUFhLENBQUMsU0FBUyxDQUFDLENBQUE7UUFDdkMsRUFBRSxDQUFDLE9BQU8sRUFBRTthQUNQLFVBQVUsQ0FBQyxZQUFZLENBQUM7YUFDeEIsTUFBTSxDQUFDLEtBQUssQ0FBQzthQUNiLEVBQUUsQ0FBQyxLQUFLLEVBQUUsR0FBRyxFQUFFO1lBQ1osT0FBTyxFQUFFLENBQUE7UUFDYixDQUFDLENBQUM7YUFDRCxFQUFFLENBQUMsT0FBTyxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7WUFDbkIsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ2pCLENBQUMsQ0FBQzthQUNELElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQTtJQUN6QixDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQTtBQUVNLE1BQU0sTUFBTSxHQUFHLEtBQUssRUFBRSxHQUFH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 \ No newline at end of file +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.createVideoFromImages = exports.merge = exports.convert = exports.convertFile = exports.converter = exports.CONVERTERS = exports.frames = void 0; +exports._convert = _convert; +const path = require("path"); +const pMap = require("p-map"); +const osr_commons_1 = require("@plastichub/osr-commons"); +const exists_1 = require("@plastichub/fs/exists"); +const dir_1 = require("@plastichub/fs/dir"); +const lib_1 = require("@plastichub/osr-cache/lib"); +const __1 = require("../../"); +const __2 = require("../../.."); +const constants_1 = require("../../../constants"); +const video_1 = require("../video"); +const FfmpegCommand = require('fluent-ffmpeg'); +const extension = (file) => path.parse(file).ext; +const mp3 = async (inputPath, outputPath) => { + return new Promise((resolve, reject) => { + const ff = new FfmpegCommand(inputPath); + ff.noVideo() + .audioCodec('libmp3lame') + .format('mp3') + .on('end', () => { + resolve(); + }) + .on('error', (error) => { + reject(error); + }) + .save(outputPath); + }); +}; +const frames = async (src, dst, onNode, options = { fps: 60 }) => { + const outputDir = path.dirname(dst); + if (!(0, exists_1.sync)(outputDir)) { + (0, dir_1.sync)(outputDir); + } + return new Promise((resolve, reject) => { + const ff = new FfmpegCommand(src); + ff.outputOptions([`-vf fps=${options.fps}`]) + .output(dst) + .on('end', () => { + resolve(); + }) + .on('error', (err) => { + reject(err); + }) + .run(); + }); +}; +exports.frames = frames; +exports.CONVERTERS = { + '.mp3': mp3, + '.jpg': exports.frames, +}; +const converter = (file) => exports.CONVERTERS[extension(file)]; +exports.converter = converter; +const convertFile = async (file, target, onNode = () => { }, options) => { + const osr_cache = (0, osr_commons_1.OSR_CACHE)(); + const ca_options = JSON.parse(JSON.stringify({ ...options, target, skip: null })); + const cached = await (0, lib_1.get_cached)(file, ca_options, constants_1.MODULE_NAME); + const conv = (0, exports.converter)(target); + if (!conv) { + __2.logger.error(`No converter found for ${file}`); + return; + } + const dstParts = path.parse(target); + if (!(0, exists_1.sync)(dstParts.dir)) { + (0, dir_1.sync)(dstParts.dir); + } + const ret = await conv(file, target, onNode, options); + return ret; +}; +exports.convertFile = convertFile; +async function _convert(file, targets, onNode = () => { }, options) { + return pMap(targets, (target) => { + options.verbose && __2.logger.debug(`Convert ${file} to ${target}`); + if (options.dry) { + return; + } + return (0, exports.convertFile)(file, target, onNode, options); + }, { concurrency: 1 }); +} +const convert = async (options) => { + let reports = []; + const onNode = (data) => { reports.push(data); }; + options.verbose && __2.logger.info(`Convert ${options.srcInfo.FILES.length} files `); + await pMap(options.srcInfo.FILES, (f) => { + const outputs = (0, __1.targets)(f, options); + options.verbose && __2.logger.info(`Convert ${f} to `, outputs); + return _convert(f, outputs, onNode, options); + }, { concurrency: 1 }); +}; +exports.convert = convert; +//ffmpeg -r 30 -i tt-1-audio.mp3 -i tt-1-%03d.jpg out.mp4 +const merge = async (options) => { + let reports = []; + const onNode = (data) => { reports.push(data); }; + __2.logger.info(`Merge ${options.srcInfo.FILES.length} files `); + return await (0, exports.createVideoFromImages)(options.srcInfo.PATH, options.dst, onNode, options.audio, {}); +}; +exports.merge = merge; +const createVideoFromImages = async (src, target, onNode, audio, { frameRate = 30, videoCodec = 'LIBX264', audioCodec = 'AAC', format = 'MP4', }) => { + return new Promise((resolve, reject) => { + const dstParts = path.parse(target); + if (!(0, exists_1.sync)(dstParts.dir)) { + (0, dir_1.sync)(dstParts.dir); + } + const ff = new FfmpegCommand(src); + //src.forEach((file) => ff.input(file)) + ff.inputOptions('-framerate', 24); + ff.inputOptions('-pattern_type', 'glob'); + ff.on('progress', (err) => { + __2.logger.debug('progress:', err); + }).on('error', (err) => { + __2.logger.error('Error:', err); + }).on('end', () => { + __2.logger.info('Video has been created successfully.'); + resolve(ff); + }); + audio && ff.addInput(audio); + ff.videoCodec(video_1.E_Codec[videoCodec]) + .output(target) + //.outputOptions(['-pix_fmt yuv420p']) + //.audioCodec(E_AudioCodec[audioCodec]) + .format(video_1.E_Format[format]) + .run(); + }); +}; +exports.createVideoFromImages = createVideoFromImages; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udmVydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9saWIvbWVkaWEvdmlkZW8vY29udmVydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUEwRUEsNEJBUUM7QUFsRkQsNkJBQTRCO0FBQzVCLDhCQUE2QjtBQUM3Qix5REFBbUQ7QUFDbkQsa0RBQXNEO0FBQ3RELDRDQUFnRDtBQUNoRCxtREFBc0Q7QUFHdEQsOEJBQWdDO0FBQ2hDLGdDQUFpQztBQUNqQyxrREFBZ0Q7QUFFaEQsb0NBQTBEO0FBRTFELE1BQU0sYUFBYSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQTtBQUU5QyxNQUFNLFNBQVMsR0FBRyxDQUFDLElBQVksRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLENBQUE7QUFDeEQsTUFBTSxHQUFHLEdBQUcsS0FBSyxFQUFFLFNBQWlCLEVBQUUsVUFBa0IsRUFBaUIsRUFBRTtJQUN2RSxPQUFPLElBQUksT0FBTyxDQUFDLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFO1FBQ25DLE1BQU0sRUFBRSxHQUFHLElBQUksYUFBYSxDQUFDLFNBQVMsQ0FBQyxDQUFBO1FBQ3ZDLEVBQUUsQ0FBQyxPQUFPLEVBQUU7YUFDUCxVQUFVLENBQUMsWUFBWSxDQUFDO2FBQ3hCLE1BQU0sQ0FBQyxLQUFLLENBQUM7YUFDYixFQUFFLENBQUMsS0FBSyxFQUFFLEdBQUcsRUFBRTtZQUNaLE9BQU8sRUFBRSxDQUFBO1FBQ2IsQ0FBQyxDQUFDO2FBQ0QsRUFBRSxDQUFDLE9BQU8sRUFBRSxDQUFDLEtBQUssRUFBRSxFQUFFO1lBQ25CLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUNqQixDQUFDLENBQUM7YUFDRCxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUE7SUFDekIsQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDLENBQUE7QUFFTSxNQUFNLE1BQU0sR0FBRyxL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 \ No newline at end of file diff --git a/packages/media/lib/media/video/index.d.ts b/packages/media/lib/media/video/index.d.ts index 4751bd18..6bc9957c 100644 --- a/packages/media/lib/media/video/index.d.ts +++ b/packages/media/lib/media/video/index.d.ts @@ -1,133 +1,46 @@ -import { z } from 'zod'; -export declare const GLOB_BASIC = "png|jpg|tiff|jpeg|webp"; -export * from './resize'; -export * from './convert'; -export declare const E_Format: { - readonly MP4: "mp4"; - readonly MKV: "mkv"; - readonly MOV: "mov"; - readonly AVI: "avi"; - readonly FLV: "flv"; - readonly WMV: "wmv"; - readonly WEBM: "webm"; - readonly MP3: "mp3"; - readonly OGG: "ogg"; - readonly WAV: "wav"; -}; -export declare const E_LogLevel: { - readonly QUIET: "quiet"; - readonly PANIC: "panic"; - readonly FATAL: "fatal"; - readonly ERROR: "error"; - readonly WARNING: "warning"; - readonly INFO: "info"; - readonly VERBOSE: "verbose"; - readonly DEBUG: "debug"; - readonly TRACE: "trace"; -}; -export declare const E_AudioCodec: { - readonly AAC: "aac"; - readonly MP3: "mp3"; - readonly VORBIS: "vorbis"; - readonly FLAC: "flac"; - readonly OPUS: "opus"; - readonly WAV: "wav"; -}; -export declare const E_Codec: { - readonly LIBX264: "libx264"; - readonly LIBX265: "libx265"; - readonly LIBVP9: "libvpx-vp9"; - readonly LIBAOM: "libaom-av1"; - readonly LIBTHEORA: "libtheora"; - readonly MPEG2VIDEO: "mpeg2video"; - readonly COPY: "copy"; -}; -declare const ffmpegOptionsSchema: z.ZodObject<{ - input: z.ZodString; - output: z.ZodString; - codec: z.ZodDefault>>; - bitrate: z.ZodOptional; - framerate: z.ZodDefault>; - resolution: z.ZodOptional; - audioCodec: z.ZodDefault>>; - audioBitrate: z.ZodOptional; - audioChannels: z.ZodDefault>; - preset: z.ZodDefault>; - crf: z.ZodDefault>; - format: z.ZodDefault>>; - startTime: z.ZodOptional; - duration: z.ZodOptional; - overwrite: z.ZodDefault>; - loglevel: z.ZodDefault>>; -}, "strip", z.ZodTypeAny, { - input?: string; - audioCodec?: "aac" | "mp3" | "vorbis" | "flac" | "opus" | "wav"; - format?: "mp3" | "wav" | "mp4" | "mkv" | "mov" | "avi" | "flv" | "wmv" | "webm" | "ogg"; - output?: string; - codec?: "libx264" | "libx265" | "libvpx-vp9" | "libaom-av1" | "libtheora" | "mpeg2video" | "copy"; - bitrate?: string; - framerate?: number; - resolution?: string; - audioBitrate?: string; - audioChannels?: number; - preset?: string; - crf?: number; - startTime?: string; - duration?: string; - overwrite?: boolean; - loglevel?: "info" | "trace" | "debug" | "error" | "fatal" | "verbose" | "quiet" | "panic" | "warning"; -}, { - input?: string; - audioCodec?: "aac" | "mp3" | "vorbis" | "flac" | "opus" | "wav"; - format?: "mp3" | "wav" | "mp4" | "mkv" | "mov" | "avi" | "flv" | "wmv" | "webm" | "ogg"; - output?: string; - codec?: "libx264" | "libx265" | "libvpx-vp9" | "libaom-av1" | "libtheora" | "mpeg2video" | "copy"; - bitrate?: string; - framerate?: number; - resolution?: string; - audioBitrate?: string; - audioChannels?: number; - preset?: string; - crf?: number; - startTime?: string; - duration?: string; - overwrite?: boolean; - loglevel?: "info" | "trace" | "debug" | "error" | "fatal" | "verbose" | "quiet" | "panic" | "warning"; -}>; -export type FFmpegOptions = z.infer; +import { z } from 'zod'; +export declare const GLOB_BASIC = "png|jpg|tiff|jpeg|webp"; +export * from './resize'; +export * from './convert'; +export declare const E_Format: { + readonly MP4: "mp4"; + readonly MKV: "mkv"; + readonly MOV: "mov"; + readonly AVI: "avi"; + readonly FLV: "flv"; + readonly WMV: "wmv"; + readonly WEBM: "webm"; + readonly MP3: "mp3"; + readonly OGG: "ogg"; + readonly WAV: "wav"; +}; +export declare const E_LogLevel: { + readonly QUIET: "quiet"; + readonly PANIC: "panic"; + readonly FATAL: "fatal"; + readonly ERROR: "error"; + readonly WARNING: "warning"; + readonly INFO: "info"; + readonly VERBOSE: "verbose"; + readonly DEBUG: "debug"; + readonly TRACE: "trace"; +}; +export declare const E_AudioCodec: { + readonly AAC: "aac"; + readonly MP3: "mp3"; + readonly VORBIS: "vorbis"; + readonly FLAC: "flac"; + readonly OPUS: "opus"; + readonly WAV: "wav"; +}; +export declare const E_Codec: { + readonly LIBX264: "libx264"; + readonly LIBX265: "libx265"; + readonly LIBVP9: "libvpx-vp9"; + readonly LIBAOM: "libaom-av1"; + readonly LIBTHEORA: "libtheora"; + readonly MPEG2VIDEO: "mpeg2video"; + readonly COPY: "copy"; +}; +declare const ffmpegOptionsSchema: any; +export type FFmpegOptions = z.infer; diff --git a/packages/media/lib/media/video/index.js b/packages/media/lib/media/video/index.js index b7470306..44a13714 100644 --- a/packages/media/lib/media/video/index.js +++ b/packages/media/lib/media/video/index.js @@ -1,85 +1,85 @@ -"use strict"; -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - var desc = Object.getOwnPropertyDescriptor(m, k); - if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { - desc = { enumerable: true, get: function() { return m[k]; } }; - } - Object.defineProperty(o, k2, desc); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __exportStar = (this && this.__exportStar) || function(m, exports) { - for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p); -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.E_Codec = exports.E_AudioCodec = exports.E_LogLevel = exports.E_Format = exports.GLOB_BASIC = void 0; -const zod_1 = require("zod"); -const FfmpegCommand = require('fluent-ffmpeg'); -exports.GLOB_BASIC = 'png|jpg|tiff|jpeg|webp'; -__exportStar(require("./resize"), exports); -__exportStar(require("./convert"), exports); -exports.E_Format = { - MP4: 'mp4', - MKV: 'mkv', - MOV: 'mov', - AVI: 'avi', - FLV: 'flv', - WMV: 'wmv', - WEBM: 'webm', - MP3: 'mp3', - OGG: 'ogg', - WAV: 'wav' -}; -exports.E_LogLevel = { - QUIET: 'quiet', - PANIC: 'panic', - FATAL: 'fatal', - ERROR: 'error', - WARNING: 'warning', - INFO: 'info', - VERBOSE: 'verbose', - DEBUG: 'debug', - TRACE: 'trace' -}; -exports.E_AudioCodec = { - AAC: 'aac', - MP3: 'mp3', - VORBIS: 'vorbis', - FLAC: 'flac', - OPUS: 'opus', - WAV: 'wav' -}; -exports.E_Codec = { - LIBX264: 'libx264', - LIBX265: 'libx265', - LIBVP9: 'libvpx-vp9', - LIBAOM: 'libaom-av1', - LIBTHEORA: 'libtheora', - MPEG2VIDEO: 'mpeg2video', - COPY: 'copy' -}; -const formatEnum = zod_1.z.nativeEnum(exports.E_Format); -const loglevelEnum = zod_1.z.nativeEnum(exports.E_LogLevel); -const audioCodecEnum = zod_1.z.nativeEnum(exports.E_AudioCodec); -const codecEnum = zod_1.z.nativeEnum(exports.E_Codec); -const ffmpegOptionsSchema = zod_1.z.object({ - input: zod_1.z.string().describe("Path to the input file"), - output: zod_1.z.string().describe("Path to the output file"), - codec: codecEnum.optional().describe("Codec to be used for encoding (e.g., 'libx264', 'aac')").default(exports.E_Codec.LIBX264), - bitrate: zod_1.z.string().optional().describe("Bitrate for encoding (e.g., '500k', '2M')"), - framerate: zod_1.z.number().optional().describe("Frames per second (e.g., 30, 60)").default(30), - resolution: zod_1.z.string().optional().describe("Resolution of the output (e.g., '1920x1080', '1280x720')"), - audioCodec: audioCodecEnum.optional().describe("Audio codec to be used for encoding (e.g., 'aac', 'mp3')").default(exports.E_AudioCodec.AAC), - audioBitrate: zod_1.z.string().optional().describe("Bitrate for audio encoding (e.g., '128k', '256k')"), - audioChannels: zod_1.z.number().optional().describe("Number of audio channels (e.g., 1 for mono, 2 for stereo)").default(2), - preset: zod_1.z.string().optional().describe("Encoding preset to use for balancing speed and quality (e.g., 'ultrafast', 'medium', 'slow')").default('medium'), - crf: zod_1.z.number().optional().describe("Constant Rate Factor for controlling quality (lower values mean higher quality, range: 0-51)").default(23), - format: formatEnum.optional().describe("Container format for output file (e.g., 'mp4', 'mkv', 'mov')").default(exports.E_Format.MP4), - startTime: zod_1.z.string().optional().describe("Start time of the input file (e.g., '00:01:30' for 1 minute 30 seconds)"), - duration: zod_1.z.string().optional().describe("Duration of the output (e.g., '00:05:00' for 5 minutes)"), - overwrite: zod_1.z.boolean().optional().describe("Whether to overwrite the output file if it already exists").default(false), - loglevel: loglevelEnum.optional().describe("Logging level for ffmpeg output").default(exports.E_LogLevel.INFO), -}); +"use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __exportStar = (this && this.__exportStar) || function(m, exports) { + for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.E_Codec = exports.E_AudioCodec = exports.E_LogLevel = exports.E_Format = exports.GLOB_BASIC = void 0; +const zod_1 = require("zod"); +const FfmpegCommand = require('fluent-ffmpeg'); +exports.GLOB_BASIC = 'png|jpg|tiff|jpeg|webp'; +__exportStar(require("./resize"), exports); +__exportStar(require("./convert"), exports); +exports.E_Format = { + MP4: 'mp4', + MKV: 'mkv', + MOV: 'mov', + AVI: 'avi', + FLV: 'flv', + WMV: 'wmv', + WEBM: 'webm', + MP3: 'mp3', + OGG: 'ogg', + WAV: 'wav' +}; +exports.E_LogLevel = { + QUIET: 'quiet', + PANIC: 'panic', + FATAL: 'fatal', + ERROR: 'error', + WARNING: 'warning', + INFO: 'info', + VERBOSE: 'verbose', + DEBUG: 'debug', + TRACE: 'trace' +}; +exports.E_AudioCodec = { + AAC: 'aac', + MP3: 'mp3', + VORBIS: 'vorbis', + FLAC: 'flac', + OPUS: 'opus', + WAV: 'wav' +}; +exports.E_Codec = { + LIBX264: 'libx264', + LIBX265: 'libx265', + LIBVP9: 'libvpx-vp9', + LIBAOM: 'libaom-av1', + LIBTHEORA: 'libtheora', + MPEG2VIDEO: 'mpeg2video', + COPY: 'copy' +}; +const formatEnum = zod_1.z.nativeEnum(exports.E_Format); +const loglevelEnum = zod_1.z.nativeEnum(exports.E_LogLevel); +const audioCodecEnum = zod_1.z.nativeEnum(exports.E_AudioCodec); +const codecEnum = zod_1.z.nativeEnum(exports.E_Codec); +const ffmpegOptionsSchema = zod_1.z.object({ + input: zod_1.z.string().describe("Path to the input file"), + output: zod_1.z.string().describe("Path to the output file"), + codec: codecEnum.optional().describe("Codec to be used for encoding (e.g., 'libx264', 'aac')").default(exports.E_Codec.LIBX264), + bitrate: zod_1.z.string().optional().describe("Bitrate for encoding (e.g., '500k', '2M')"), + framerate: zod_1.z.number().optional().describe("Frames per second (e.g., 30, 60)").default(30), + resolution: zod_1.z.string().optional().describe("Resolution of the output (e.g., '1920x1080', '1280x720')"), + audioCodec: audioCodecEnum.optional().describe("Audio codec to be used for encoding (e.g., 'aac', 'mp3')").default(exports.E_AudioCodec.AAC), + audioBitrate: zod_1.z.string().optional().describe("Bitrate for audio encoding (e.g., '128k', '256k')"), + audioChannels: zod_1.z.number().optional().describe("Number of audio channels (e.g., 1 for mono, 2 for stereo)").default(2), + preset: zod_1.z.string().optional().describe("Encoding preset to use for balancing speed and quality (e.g., 'ultrafast', 'medium', 'slow')").default('medium'), + crf: zod_1.z.number().optional().describe("Constant Rate Factor for controlling quality (lower values mean higher quality, range: 0-51)").default(23), + format: formatEnum.optional().describe("Container format for output file (e.g., 'mp4', 'mkv', 'mov')").default(exports.E_Format.MP4), + startTime: zod_1.z.string().optional().describe("Start time of the input file (e.g., '00:01:30' for 1 minute 30 seconds)"), + duration: zod_1.z.string().optional().describe("Duration of the output (e.g., '00:05:00' for 5 minutes)"), + overwrite: zod_1.z.boolean().optional().describe("Whether to overwrite the output file if it already exists").default(false), + loglevel: loglevelEnum.optional().describe("Logging level for ffmpeg output").default(exports.E_LogLevel.INFO), +}); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGliL21lZGlhL3ZpZGVvL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRUEsNkJBQXVCO0FBRXZCLE1BQU0sYUFBYSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQTtBQUVqQyxRQUFBLFVBQVUsR0FBRyx3QkFBd0IsQ0FBQTtBQUNsRCwyQ0FBd0I7QUFDeEIsNENBQXlCO0FBRVosUUFBQSxRQUFRLEdBQUc7SUFDcEIsR0FBRyxFQUFFLEtBQUs7SUFDVixHQUFHLEVBQUUsS0FBSztJQUNWLEdBQUcsRUFBRSxLQUFLO0lBQ1YsR0FBRyxFQUFFLEtBQUs7SUFDVixHQUFHLEVBQUUsS0FBSztJQUNWLEdBQUcsRUFBRSxLQUFLO0lBQ1YsSUFBSSxFQUFFLE1BQU07SUFDWixHQUFHLEVBQUUsS0FBSztJQUNWLEdBQUcsRUFBRSxLQUFLO0lBQ1YsR0FBRyxFQUFFLEtBQUs7Q0FDRixDQUFDO0FBRUUsUUFBQSxVQUFVLEdBQUc7SUFDeEIsS0FBSyxFQUFFLE9BQU87SUFDZCxLQUFLLEVBQUUsT0FBTztJQUNkLEtBQUssRUFBRSxPQUFPO0lBQ2QsS0FBSyxFQUFFLE9BQU87SUFDZCxPQUFPLEVBQUUsU0FBUztJQUNsQixJQUFJLEVBQUUsTUFBTTtJQUNaLE9BQU8sRUFBRSxTQUFTO0lBQ2xCLEtBQUssRUFBRSxPQUFPO0lBQ2QsS0FBSyxFQUFFLE9BQU87Q0FDTixDQUFDO0FBRUUsUUFBQSxZQUFZLEdBQUc7SUFDMUIsR0FBRyxFQUFFLEtBQUs7SUFDVixHQUFHLEVBQUUsS0FBSztJQUNWLE1BQU0sRUFBRSxRQUFRO0lBQ2hCLElBQUksRUFBRSxNQUFNO0lBQ1osSUFBSSxFQUFFLE1BQU07SUFDWixHQUFHLEVBQUUsS0FBSztDQUNGLENBQUM7QUFFRSxRQUFBLE9BQU8sR0FBRztJQUNyQixPQUFPLEVBQUUsU0FBUztJQUNsQixP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 \ No newline at end of file diff --git a/packages/media/lib/media/video/resize.d.ts b/packages/media/lib/media/video/resize.d.ts index 3c30cc32..07d03126 100644 --- a/packages/media/lib/media/video/resize.d.ts +++ b/packages/media/lib/media/video/resize.d.ts @@ -1,6 +1,6 @@ -import * as sharp from 'sharp'; -import { IOptions, IResizeOptions } from '../../../types'; -export declare const meta: (file: any, image: sharp.Sharp) => Promise; -export declare const resizeFile: (file: any, target: any, onNode: (data: any) => void, options: IResizeOptions) => Promise; -export declare const _resize: (file: any, targets: string[], onNode: (data: any) => void, options: IOptions) => Promise; -export declare const resize: (options: IOptions) => Promise; +import * as sharp from 'sharp'; +import { IOptions, IResizeOptions } from '../../../types'; +export declare const meta: (file: any, image: sharp.Sharp) => Promise; +export declare const resizeFile: (file: any, target: any, onNode: (data: any) => void, options: IResizeOptions) => Promise; +export declare const _resize: (file: any, targets: string[], onNode: (data: any) => void, options: IOptions) => Promise; +export declare const resize: (options: IOptions) => Promise; diff --git a/packages/media/lib/media/video/resize.js b/packages/media/lib/media/video/resize.js index 5910729b..7f488f3a 100644 --- a/packages/media/lib/media/video/resize.js +++ b/packages/media/lib/media/video/resize.js @@ -1,160 +1,160 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.resize = exports._resize = exports.resizeFile = exports.meta = void 0; -const path = require("path"); -const bluebird = require("bluebird"); -const bluebird_1 = require("bluebird"); -const sharp = require("sharp"); -const __1 = require("../../.."); -const exists_1 = require("@plastichub/fs/exists"); -const move_1 = require("@plastichub/fs/move"); -const dir_1 = require("@plastichub/fs/dir"); -const inspect_1 = require("@plastichub/fs/inspect"); -const lib_1 = require("@plastichub/osr-cache/lib"); -const constants_1 = require("../../../constants"); -const osr_commons_1 = require("@plastichub/osr-commons"); -const __2 = require("../../"); -const meta = (file, image) => { - return new Promise((resolve, reject) => { - image.metadata().then((meta) => { - resolve(meta); - }).catch((e) => { - __1.logger.error(`Error creating meta data ${file}`); - resolve(null); - }); - }); -}; -exports.meta = meta; -const resizeFile = async (file, target, onNode = () => { }, options) => { - const osr_cache = (0, osr_commons_1.OSR_CACHE)(); - const ca_options = JSON.parse(JSON.stringify({ ...options, target, skip: null })); - const cached = await (0, lib_1.get_cached)(file, ca_options, constants_1.MODULE_NAME); - const targetOri = '' + target; - let inPlace = false; - if (path.resolve(file) === path.resolve(target)) { - const parts = path.parse(target); - target = path.join(parts.dir, parts.name + '_tmp' + parts.ext); - inPlace = true; - } - let image; - try { - image = sharp(file); - } - catch (e) { - __1.logger.error(`Error reading file, ${file}`, e); - return null; - } - onNode(image); - let metaData = await (0, exports.meta)(file, image) || {}; - const percent = options.percent; - const srcParts = path.parse(file); - const dstParts = path.parse(target); - const node = (0, inspect_1.createItem)(file, { - size: true, - mime: true - }); - if (!(0, exists_1.sync)(dstParts.dir)) { - (0, dir_1.sync)(dstParts.dir); - } - if (options.width <= options.minWidth) { - __1.logger.error(`Error resizing : options.width <= options.minWidth`); - return; - } - if (metaData.width && options.width && options.minWidth) { - if (metaData.width < options.minWidth) { - return image; - } - } - if (metaData.height && options.height && options.minHeight) { - if (metaData.height < options.minHeight) { - return image; - } - } - if (options.minSize && options.minSize > node.size) { - return image; - } - if (percent && metaData.width) { - image = image.resize({ - width: Math.round(metaData.width * (percent / 100)), - fastShrinkOnLoad: options.fastShrinkOnLoad, - withoutEnlargement: options.withoutEnlargement, - withoutReduction: options.withoutReduction, - fit: options.fit, - position: options.position - }); - } - else if (options.width || options.height) { - image = image.resize({ - width: options.width, - height: options.height, - fastShrinkOnLoad: options.fastShrinkOnLoad, - withoutEnlargement: options.withoutEnlargement, - withoutReduction: options.withoutReduction, - fit: options.fit, - position: options.position - }); - } - else { - __1.logger.error(`Error resizing, invalid options for ${file} - no width, height or percent`); - return image; - } - if (metaData.width) { - await image.withMetadata().toFile(target); - } - else { - try { - await image.toFile(target); - } - catch (e) { - __1.logger.error(`Error writing file out, ${file}`, e); - return null; - } - } - if (inPlace) { - const timeout = async (retry) => new Promise((resolve) => { - setTimeout(resolve, 500 * retry); - }); - const moveRetry = async (src, dst, retry = 0) => { - if (retry > 6) { - __1.logger.error(`Error moving file failed, max retries reached ${src}`); - return; - } - try { - await (0, move_1.async)(target, targetOri); - } - catch (e) { - if (e.code === 'EPERM') { - __1.logger.warn(`Error moving file out, retry ${file}`, e); - await timeout(retry); - moveRetry(src, dst, retry + 1); - } - } - }; - await moveRetry(file, targetOri); - } - options.debug && __1.logger.debug(`Resized Image ${file} to ${targetOri}`); - return image; -}; -exports.resizeFile = resizeFile; -const _resize = async (file, targets, onNode = () => { }, options) => { - return bluebird_1.Promise.resolve(targets).map((target) => { - options.verbose && __1.logger.debug(`Resizing ${file} to ${target}`); - if (options.dry) { - return bluebird.resolve(); - } - return (0, exports.resizeFile)(file, target, onNode, options); - }, { concurrency: 1 }); -}; -exports._resize = _resize; -const resize = async (options) => { - let reports = []; - const onNode = (data) => { reports.push(data); }; - options.verbose && __1.logger.info(`Convert ${options.srcInfo.FILES.length} files `); - await bluebird_1.Promise.resolve(options.srcInfo.FILES).map((f) => { - const outputs = (0, __2.targets)(f, options); - options.verbose && __1.logger.info(`Convert ${f} to `, outputs); - return (0, exports._resize)(f, outputs, onNode, options); - }, { concurrency: 1 }); -}; -exports.resize = resize; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzaXplLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9tZWRpYS92aWRlby9yZXNpemUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkJBQTRCO0FBQzVCLHFDQUFvQztBQUNwQyx1Q0FBOEM7QUFDOUMsK0JBQThCO0FBRTlCLGdDQUFpQztBQUVqQyxrREFBc0Q7QUFDdEQsOENBQW1EO0FBQ25ELDRDQUFnRDtBQUNoRCxvREFBNkQ7QUFFN0QsbURBRWtDO0FBRWxDLGtEQUUyQjtBQUUzQix5REFBbUQ7QUFFbkQsOEJBRWU7QUFFUixNQUFNLElBQUksR0FBRyxDQUFDLElBQUksRUFBRSxLQUFrQixFQUEyQixFQUFFO0lBQ3RFLE9BQU8sSUFBSSxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7UUFDbkMsS0FBSyxDQUFDLFFBQVEsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO1lBQzNCLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQTtRQUNqQixDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtZQUNYLFVBQU0sQ0FBQyxLQUFLLENBQUMsNEJBQTRCLElBQUksRUFBRSxDQUFDLENBQUE7WUFDaEQsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFBO1FBQ2pCLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDLENBQUE7QUFUWSxRQUFBLElBQUksUUFTaEI7QUFFTSxNQUFNLFVBQVUsR0FBRyxLQUFLLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxTQUE4QixHQUFHLEVBQUUsR0FBRyxDQUFDLEVBQUUsT0FBdUIsRUFBd0IsRUFBRTtJQUVySSxNQUFNLFNBQVMsR0FBRyxJQUFBLHVCQUFTLEdBQUUsQ0FBQTtJQUM3QixNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxTQUFT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 \ No newline at end of file +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.resize = exports._resize = exports.resizeFile = exports.meta = void 0; +const path = require("path"); +const bluebird = require("bluebird"); +const bluebird_1 = require("bluebird"); +const sharp = require("sharp"); +const __1 = require("../../.."); +const exists_1 = require("@plastichub/fs/exists"); +const move_1 = require("@plastichub/fs/move"); +const dir_1 = require("@plastichub/fs/dir"); +const inspect_1 = require("@plastichub/fs/inspect"); +const lib_1 = require("@plastichub/osr-cache/lib"); +const constants_1 = require("../../../constants"); +const osr_commons_1 = require("@plastichub/osr-commons"); +const __2 = require("../../"); +const meta = (file, image) => { + return new Promise((resolve, reject) => { + image.metadata().then((meta) => { + resolve(meta); + }).catch((e) => { + __1.logger.error(`Error creating meta data ${file}`); + resolve(null); + }); + }); +}; +exports.meta = meta; +const resizeFile = async (file, target, onNode = () => { }, options) => { + const osr_cache = (0, osr_commons_1.OSR_CACHE)(); + const ca_options = JSON.parse(JSON.stringify({ ...options, target, skip: null })); + const cached = await (0, lib_1.get_cached)(file, ca_options, constants_1.MODULE_NAME); + const targetOri = '' + target; + let inPlace = false; + if (path.resolve(file) === path.resolve(target)) { + const parts = path.parse(target); + target = path.join(parts.dir, parts.name + '_tmp' + parts.ext); + inPlace = true; + } + let image; + try { + image = sharp(file); + } + catch (e) { + __1.logger.error(`Error reading file, ${file}`, e); + return null; + } + onNode(image); + let metaData = await (0, exports.meta)(file, image) || {}; + const percent = options.percent; + const srcParts = path.parse(file); + const dstParts = path.parse(target); + const node = (0, inspect_1.createItem)(file, { + size: true, + mime: true + }); + if (!(0, exists_1.sync)(dstParts.dir)) { + (0, dir_1.sync)(dstParts.dir); + } + if (options.width <= options.minWidth) { + __1.logger.error(`Error resizing : options.width <= options.minWidth`); + return; + } + if (metaData.width && options.width && options.minWidth) { + if (metaData.width < options.minWidth) { + return image; + } + } + if (metaData.height && options.height && options.minHeight) { + if (metaData.height < options.minHeight) { + return image; + } + } + if (options.minSize && options.minSize > node.size) { + return image; + } + if (percent && metaData.width) { + image = image.resize({ + width: Math.round(metaData.width * (percent / 100)), + fastShrinkOnLoad: options.fastShrinkOnLoad, + withoutEnlargement: options.withoutEnlargement, + withoutReduction: options.withoutReduction, + fit: options.fit, + position: options.position + }); + } + else if (options.width || options.height) { + image = image.resize({ + width: options.width, + height: options.height, + fastShrinkOnLoad: options.fastShrinkOnLoad, + withoutEnlargement: options.withoutEnlargement, + withoutReduction: options.withoutReduction, + fit: options.fit, + position: options.position + }); + } + else { + __1.logger.error(`Error resizing, invalid options for ${file} - no width, height or percent`); + return image; + } + if (metaData.width) { + await image.withMetadata().toFile(target); + } + else { + try { + await image.toFile(target); + } + catch (e) { + __1.logger.error(`Error writing file out, ${file}`, e); + return null; + } + } + if (inPlace) { + const timeout = async (retry) => new Promise((resolve) => { + setTimeout(resolve, 500 * retry); + }); + const moveRetry = async (src, dst, retry = 0) => { + if (retry > 6) { + __1.logger.error(`Error moving file failed, max retries reached ${src}`); + return; + } + try { + await (0, move_1.async)(target, targetOri); + } + catch (e) { + if (e.code === 'EPERM') { + __1.logger.warn(`Error moving file out, retry ${file}`, e); + await timeout(retry); + moveRetry(src, dst, retry + 1); + } + } + }; + await moveRetry(file, targetOri); + } + options.debug && __1.logger.debug(`Resized Image ${file} to ${targetOri}`); + return image; +}; +exports.resizeFile = resizeFile; +const _resize = async (file, targets, onNode = () => { }, options) => { + return bluebird_1.Promise.resolve(targets).map((target) => { + options.verbose && __1.logger.debug(`Resizing ${file} to ${target}`); + if (options.dry) { + return bluebird.resolve(); + } + return (0, exports.resizeFile)(file, target, onNode, options); + }, { concurrency: 1 }); +}; +exports._resize = _resize; +const resize = async (options) => { + let reports = []; + const onNode = (data) => { reports.push(data); }; + options.verbose && __1.logger.info(`Convert ${options.srcInfo.FILES.length} files `); + await bluebird_1.Promise.resolve(options.srcInfo.FILES).map((f) => { + const outputs = (0, __2.targets)(f, options); + options.verbose && __1.logger.info(`Convert ${f} to `, outputs); + return (0, exports._resize)(f, outputs, onNode, options); + }, { concurrency: 1 }); +}; +exports.resize = resize; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzaXplLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9tZWRpYS92aWRlby9yZXNpemUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkJBQTRCO0FBQzVCLHFDQUFvQztBQUNwQyx1Q0FBOEM7QUFDOUMsK0JBQThCO0FBRTlCLGdDQUFpQztBQUVqQyxrREFBc0Q7QUFDdEQsOENBQW1EO0FBQ25ELDRDQUFnRDtBQUNoRCxvREFBNkQ7QUFFN0QsbURBRWtDO0FBRWxDLGtEQUUyQjtBQUUzQix5REFBbUQ7QUFFbkQsOEJBRWU7QUFFUixNQUFNLElBQUksR0FBRyxDQUFDLElBQUksRUFBRSxLQUFrQixFQUEyQixFQUFFO0lBQ3RFLE9BQU8sSUFBSSxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7UUFDbkMsS0FBSyxDQUFDLFFBQVEsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO1lBQzNCLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQTtRQUNqQixDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtZQUNYLFVBQU0sQ0FBQyxLQUFLLENBQUMsNEJBQTRCLElBQUksRUFBRSxDQUFDLENBQUE7WUFDaEQsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFBO1FBQ2pCLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDLENBQUE7QUFUWSxRQUFBLElBQUksUUFTaEI7QUFFTSxNQUFNLFVBQVUsR0FBRyxLQUFLLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxTQUE4QixHQUFHLEVBQUUsR0FBRyxDQUFDLEVBQUUsT0FBdUIsRUFBd0IsRUFBRTtJQUVySSxNQUFNLFNBQVMsR0FBRyxJQUFBLHVCQUFTLEdBQUUsQ0FBQTtJQUM3QixNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxTQUFT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 \ No newline at end of file diff --git a/packages/media/lib/process/index.d.ts b/packages/media/lib/process/index.d.ts index a7b3285c..268d212b 100644 --- a/packages/media/lib/process/index.d.ts +++ b/packages/media/lib/process/index.d.ts @@ -1,18 +1,18 @@ -export declare enum STATUS { - OK = 0, - ERROR = 1, - PENDING = 2 -} -export declare class Process { - binary: string; - cwd: string; - args: string; - constructor(options?: any); - optionsToString(options: any): string; - optionsToArray(options: any): string[]; - exec(command: string, options?: any, args?: any[]): Promise; -} -export declare class Helper { - static run(cwd: any, command: string, gitArgs: string[]): Promise; - static runBin(cwd: any, bin: any, command: string, gitArgs: string[]): Promise; -} +export declare enum STATUS { + OK = 0, + ERROR = 1, + PENDING = 2 +} +export declare class Process { + binary: string; + cwd: string; + args: string; + constructor(options?: any); + optionsToString(options: any): string; + optionsToArray(options: any): string[]; + exec(command: string, options?: any, args?: any[]): Promise; +} +export declare class Helper { + static run(cwd: any, command: string, gitArgs: string[]): Promise; + static runBin(cwd: any, bin: any, command: string, gitArgs: string[]): Promise; +} diff --git a/packages/media/lib/process/index.js b/packages/media/lib/process/index.js index 44bb43e2..7620036f 100644 --- a/packages/media/lib/process/index.js +++ b/packages/media/lib/process/index.js @@ -1,149 +1,149 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.Helper = exports.Process = exports.STATUS = void 0; -const __1 = require("../.."); -const child_process_1 = require("child_process"); -const platform_1 = require("../common/platform"); -var STATUS; -(function (STATUS) { - STATUS[STATUS["OK"] = 0] = "OK"; - STATUS[STATUS["ERROR"] = 1] = "ERROR"; - STATUS[STATUS["PENDING"] = 2] = "PENDING"; -})(STATUS = exports.STATUS || (exports.STATUS = {})); -const fatalHandler = (message, fn) => { - if (message.startsWith('fatal:')) { - fn('\t\ ' + message); - return true; - } - return false; -}; -// tslint:disable-next-line:no-empty -const subscribe = (signal, collector = () => { }) => { - const buffer = []; - signal.on('message', (message) => __1.logger.debug('message', message)); - signal.on('error', (error) => __1.logger.error('std-error', error)); - signal.on('data', (data) => { - const message = data.toString(); - buffer.push(message); // .replace(/[\x00-\x1F\x7F-\x9F]/g, "") - collector(buffer); - }); -}; -const merge = (buffer, data) => buffer.concat(data); -const hook = (process, resolve, reject, cmd) => { - let buffer = []; - const collector = (data) => { buffer = buffer.concat(data); }; - const stdout = subscribe(process.stdout, collector); - const stderr = subscribe(process.stderr, collector); - process.on('exit', (code, signal) => { - if (code) { - resolve({ - code: STATUS.ERROR, - command: cmd, - error: code, - messages: buffer - }); - } - else { - resolve({ - code: STATUS.OK, - command: cmd, - messages: buffer - }); - } - }); - return process; -}; -class Process { - binary = 'magick'; - cwd = ''; - args = ''; - constructor(options = {}) { - this.binary = options.binary || this.binary; - //this.binary = path.resolve(which(this.binary)); - this.cwd = options.cwd || process.cwd(); - } - optionsToString(options) { - const args = []; - // tslint:disable-next-line:forin - for (const k in options) { - const val = options[k]; - if (k.length === 1) { - // val is true, add '-k' - if (val === true) { - args.push('-' + k); - } - else if (val !== false) { - // if val is not false, add '-k val' - args.push('-' + k + ' ' + val); - } - } - else { - if (val === true) { - args.push('--' + k); - } - else if (val !== false) { - args.push('--' + k + '=' + val); - } - } - } - return args.join(' '); - } - optionsToArray(options) { - const args = []; - // tslint:disable-next-line:forin - for (const k in options) { - const val = options[k]; - if (k.length === 1) { - // val is true, add '-k' - if (val === true) { - args.push('-' + k); - } - else if (val !== false) { - // if val is not false, add '-k val' - args.push('-' + k + ' ' + val); - } - } - else { - if (val === true) { - args.push('--' + k); - } - else if (val !== false) { - args.push('--' + k + '=' + val); - } - } - } - return args; - } - async exec(command, options = {}, args = []) { - args = [command].concat(args); - return new Promise((resolve, reject) => { - const p = (0, child_process_1.exec)(this.binary + ' ' + args.join(' '), { - cwd: this.cwd - }); - return hook(p, resolve, reject, this.binary + ' ' + args.join(' ')); - }); - } -} -exports.Process = Process; -class Helper { - static async run(cwd, command, gitArgs) { - const gitProcess = new Process({ - cwd: cwd, - binary: (0, platform_1.os)() == 'windows' ? 'magick' : '' - }); - const p = gitProcess.exec(command, {}, gitArgs); - p.catch((e) => __1.logger.error('Error git command : ' + command)); - return p; - } - static async runBin(cwd, bin, command, gitArgs) { - const gitProcess = new Process({ - cwd: cwd, - binary: bin - }); - const p = gitProcess.exec(command, {}, gitArgs); - p.catch((e) => __1.logger.error('Error git command : ' + command)); - return p; - } -} -exports.Helper = Helper; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL3Byb2Nlc3MvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkJBQStCO0FBRS9CLGlEQUFtRDtBQUNuRCxpREFBd0M7QUFFeEMsSUFBWSxNQUlYO0FBSkQsV0FBWSxNQUFNO0lBQ2QsK0JBQUUsQ0FBQTtJQUNGLHFDQUFLLENBQUE7SUFDTCx5Q0FBTyxDQUFBO0FBQ1gsQ0FBQyxFQUpXLE1BQU0sR0FBTixjQUFNLEtBQU4sY0FBTSxRQUlqQjtBQUVELE1BQU0sWUFBWSxHQUFHLENBQUMsT0FBZSxFQUFFLEVBQXlCLEVBQVcsRUFBRTtJQUN6RSxJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEVBQUU7UUFDOUIsRUFBRSxDQUFDLE1BQU0sR0FBRyxPQUFPLENBQUMsQ0FBQztRQUNyQixPQUFPLElBQUksQ0FBQztLQUNmO0lBQ0QsT0FBTyxLQUFLLENBQUM7QUFDakIsQ0FBQyxDQUFDO0FBRUYsb0NBQW9DO0FBQ3BDLE1BQU0sU0FBUyxHQUFHLENBQUMsTUFBdUIsRUFBRSxZQUFpQyxHQUFHLEVBQUUsR0FBRyxDQUFDLEVBQUUsRUFBRTtJQUN0RixNQUFNLE1BQU0sR0FBYSxFQUFFLENBQUM7SUFDNUIsTUFBTSxDQUFDLEVBQUUsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLFVBQU0sQ0FBQyxLQUFLLENBQUMsU0FBUyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUM7SUFDcEUsTUFBTSxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLFVBQU0sQ0FBQyxLQUFLLENBQUMsV0FBVyxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUM7SUFDaEUsTUFBTSxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxJQUFJLEVBQUUsRUFBRTtRQUN2QixNQUFNLE9BQU8sR0FBRyxJQUFJ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 \ No newline at end of file +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.Helper = exports.Process = exports.STATUS = void 0; +const __1 = require("../.."); +const child_process_1 = require("child_process"); +const platform_1 = require("../common/platform"); +var STATUS; +(function (STATUS) { + STATUS[STATUS["OK"] = 0] = "OK"; + STATUS[STATUS["ERROR"] = 1] = "ERROR"; + STATUS[STATUS["PENDING"] = 2] = "PENDING"; +})(STATUS || (exports.STATUS = STATUS = {})); +const fatalHandler = (message, fn) => { + if (message.startsWith('fatal:')) { + fn('\t\ ' + message); + return true; + } + return false; +}; +// tslint:disable-next-line:no-empty +const subscribe = (signal, collector = () => { }) => { + const buffer = []; + signal.on('message', (message) => __1.logger.debug('message', message)); + signal.on('error', (error) => __1.logger.error('std-error', error)); + signal.on('data', (data) => { + const message = data.toString(); + buffer.push(message); // .replace(/[\x00-\x1F\x7F-\x9F]/g, "") + collector(buffer); + }); +}; +const merge = (buffer, data) => buffer.concat(data); +const hook = (process, resolve, reject, cmd) => { + let buffer = []; + const collector = (data) => { buffer = buffer.concat(data); }; + const stdout = subscribe(process.stdout, collector); + const stderr = subscribe(process.stderr, collector); + process.on('exit', (code, signal) => { + if (code) { + resolve({ + code: STATUS.ERROR, + command: cmd, + error: code, + messages: buffer + }); + } + else { + resolve({ + code: STATUS.OK, + command: cmd, + messages: buffer + }); + } + }); + return process; +}; +class Process { + binary = 'magick'; + cwd = ''; + args = ''; + constructor(options = {}) { + this.binary = options.binary || this.binary; + //this.binary = path.resolve(which(this.binary)); + this.cwd = options.cwd || process.cwd(); + } + optionsToString(options) { + const args = []; + // tslint:disable-next-line:forin + for (const k in options) { + const val = options[k]; + if (k.length === 1) { + // val is true, add '-k' + if (val === true) { + args.push('-' + k); + } + else if (val !== false) { + // if val is not false, add '-k val' + args.push('-' + k + ' ' + val); + } + } + else { + if (val === true) { + args.push('--' + k); + } + else if (val !== false) { + args.push('--' + k + '=' + val); + } + } + } + return args.join(' '); + } + optionsToArray(options) { + const args = []; + // tslint:disable-next-line:forin + for (const k in options) { + const val = options[k]; + if (k.length === 1) { + // val is true, add '-k' + if (val === true) { + args.push('-' + k); + } + else if (val !== false) { + // if val is not false, add '-k val' + args.push('-' + k + ' ' + val); + } + } + else { + if (val === true) { + args.push('--' + k); + } + else if (val !== false) { + args.push('--' + k + '=' + val); + } + } + } + return args; + } + async exec(command, options = {}, args = []) { + args = [command].concat(args); + return new Promise((resolve, reject) => { + const p = (0, child_process_1.exec)(this.binary + ' ' + args.join(' '), { + cwd: this.cwd + }); + return hook(p, resolve, reject, this.binary + ' ' + args.join(' ')); + }); + } +} +exports.Process = Process; +class Helper { + static async run(cwd, command, gitArgs) { + const gitProcess = new Process({ + cwd: cwd, + binary: (0, platform_1.os)() == 'windows' ? 'magick' : '' + }); + const p = gitProcess.exec(command, {}, gitArgs); + p.catch((e) => __1.logger.error('Error git command : ' + command)); + return p; + } + static async runBin(cwd, bin, command, gitArgs) { + const gitProcess = new Process({ + cwd: cwd, + binary: bin + }); + const p = gitProcess.exec(command, {}, gitArgs); + p.catch((e) => __1.logger.error('Error git command : ' + command)); + return p; + } +} +exports.Helper = Helper; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL3Byb2Nlc3MvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkJBQStCO0FBRS9CLGlEQUFtRDtBQUNuRCxpREFBd0M7QUFFeEMsSUFBWSxNQUlYO0FBSkQsV0FBWSxNQUFNO0lBQ2QsK0JBQUUsQ0FBQTtJQUNGLHFDQUFLLENBQUE7SUFDTCx5Q0FBTyxDQUFBO0FBQ1gsQ0FBQyxFQUpXLE1BQU0sc0JBQU4sTUFBTSxRQUlqQjtBQUVELE1BQU0sWUFBWSxHQUFHLENBQUMsT0FBZSxFQUFFLEVBQXlCLEVBQVcsRUFBRTtJQUN6RSxJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQztRQUMvQixFQUFFLENBQUMsTUFBTSxHQUFHLE9BQU8sQ0FBQyxDQUFDO1FBQ3JCLE9BQU8sSUFBSSxDQUFDO0lBQ2hCLENBQUM7SUFDRCxPQUFPLEtBQUssQ0FBQztBQUNqQixDQUFDLENBQUM7QUFFRixvQ0FBb0M7QUFDcEMsTUFBTSxTQUFTLEdBQUcsQ0FBQyxNQUF1QixFQUFFLFlBQWlDLEdBQUcsRUFBRSxHQUFHLENBQUMsRUFBRSxFQUFFO0lBQ3RGLE1BQU0sTUFBTSxHQUFhLEVBQUUsQ0FBQztJQUM1QixNQUFNLENBQUMsRUFBRSxDQUFDLFNBQVMsRUFBRSxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsVUFBTSxDQUFDLEtBQUssQ0FBQyxTQUFTLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQztJQUNwRSxNQUFNLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsVUFBTSxDQUFDLEtBQUssQ0FBQyxXQUFXLEVBQUUsS0FBSyxDQUFDLENBQUMsQ0FBQztJQUNoRSxNQUFNLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxDQUFDLElBQUksRUFBRSxFQUFFO1FBQ3ZCLE1BQU0sT0FBTyxHQUFHLElB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 \ No newline at end of file diff --git a/packages/media/main.d.ts b/packages/media/main.d.ts index d1ebc9c7..b7988016 100644 --- a/packages/media/main.d.ts +++ b/packages/media/main.d.ts @@ -1,2 +1,2 @@ -#!/usr/bin/env node -export {}; +#!/usr/bin/env node +export {}; diff --git a/packages/media/main.js b/packages/media/main.js index 90ed69ea..27e534f9 100644 --- a/packages/media/main.js +++ b/packages/media/main.js @@ -1,29 +1,29 @@ #!/usr/bin/env node -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const _cli_1 = require("./_cli"); -(0, _cli_1.defaults)(); -const cli = require("yargs"); -const pdf2jpg_1 = require("./commands/pdf2jpg"); -(0, pdf2jpg_1.register)(cli); -const svg2jpg_1 = require("./commands/svg2jpg"); -(0, svg2jpg_1.register)(cli); -const resize_1 = require("./commands/resize"); -(0, resize_1.register)(cli); -const convert_1 = require("./commands/convert"); -(0, convert_1.register)(cli); -const audio_1 = require("./commands/audio"); -(0, audio_1.register)(cli); -const video_1 = require("./commands/video"); -(0, video_1.register)(cli); -const watermark_1 = require("./commands/watermark"); -(0, watermark_1.register)(cli); -const argv = cli.argv; -if (argv.h || argv.help) { - cli.showHelp(); - process.exit(); -} -else if (argv.v || argv.version) { - process.exit(); -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInNyYy9tYWluLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLGlDQUFrQztBQUFDLElBQUEsZUFBUSxHQUFFLENBQUE7QUFFN0MsNkJBQTRCO0FBRTVCLGdEQUFpRTtBQUFDLElBQUEsa0JBQWUsRUFBQyxHQUFHLENBQUMsQ0FBQTtBQUN0RixnREFBaUU7QUFBQyxJQUFBLGtCQUFlLEVBQUMsR0FBRyxDQUFDLENBQUE7QUFDdEYsOENBQStEO0FBQUMsSUFBQSxpQkFBYyxFQUFDLEdBQUcsQ0FBQyxDQUFBO0FBQ25GLGdEQUFpRTtBQUFDLElBQUEsa0JBQWUsRUFBQyxHQUFHLENBQUMsQ0FBQTtBQUN0Riw0Q0FBNkQ7QUFBQyxJQUFBLGdCQUFhLEVBQUMsR0FBRyxDQUFDLENBQUE7QUFDaEYsNENBQTZEO0FBQUMsSUFBQSxnQkFBYSxFQUFDLEdBQUcsQ0FBQyxDQUFBO0FBQ2hGLG9EQUFxRTtBQUFDLElBQUEsb0JBQWlCLEVBQUMsR0FBRyxDQUFDLENBQUE7QUFFNUYsTUFBTSxJQUFJLEdBQVEsR0FBRyxDQUFDLElBQUksQ0FBQztBQUUzQixJQUFJLElBQUksQ0FBQyxDQUFDLElBQUksSUFBSSxDQUFDLElBQUksRUFBRTtJQUNyQixHQUFHLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDZixPQUFPLENBQUMsSUFBSSxFQUFFLENBQUM7Q0FDbEI7S0FBTSxJQUFJLElBQUksQ0FBQyxDQUFDLElBQUksSUFBSSxDQUFDLE9BQU8sRUFBRTtJQUMvQixPQUFPLENBQUMsSUFBSSxFQUFFLENBQUM7Q0FDbEIifQ== \ No newline at end of file +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +const _cli_1 = require("./_cli"); +(0, _cli_1.defaults)(); +const cli = require("yargs"); +const pdf2jpg_1 = require("./commands/pdf2jpg"); +(0, pdf2jpg_1.register)(cli); +const svg2jpg_1 = require("./commands/svg2jpg"); +(0, svg2jpg_1.register)(cli); +const resize_1 = require("./commands/resize"); +(0, resize_1.register)(cli); +const convert_1 = require("./commands/convert"); +(0, convert_1.register)(cli); +const audio_1 = require("./commands/audio"); +(0, audio_1.register)(cli); +const video_1 = require("./commands/video"); +(0, video_1.register)(cli); +const watermark_1 = require("./commands/watermark"); +(0, watermark_1.register)(cli); +const argv = cli.argv; +if (argv.h || argv.help) { + cli.showHelp(); + process.exit(); +} +else if (argv.v || argv.version) { + process.exit(); +} +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInNyYy9tYWluLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLGlDQUFrQztBQUFDLElBQUEsZUFBUSxHQUFFLENBQUE7QUFFN0MsNkJBQTRCO0FBRTVCLGdEQUFpRTtBQUFDLElBQUEsa0JBQWUsRUFBQyxHQUFHLENBQUMsQ0FBQTtBQUN0RixnREFBaUU7QUFBQyxJQUFBLGtCQUFlLEVBQUMsR0FBRyxDQUFDLENBQUE7QUFDdEYsOENBQStEO0FBQUMsSUFBQSxpQkFBYyxFQUFDLEdBQUcsQ0FBQyxDQUFBO0FBQ25GLGdEQUFpRTtBQUFDLElBQUEsa0JBQWUsRUFBQyxHQUFHLENBQUMsQ0FBQTtBQUN0Riw0Q0FBNkQ7QUFBQyxJQUFBLGdCQUFhLEVBQUMsR0FBRyxDQUFDLENBQUE7QUFDaEYsNENBQTZEO0FBQUMsSUFBQSxnQkFBYSxFQUFDLEdBQUcsQ0FBQyxDQUFBO0FBQ2hGLG9EQUFxRTtBQUFDLElBQUEsb0JBQWlCLEVBQUMsR0FBRyxDQUFDLENBQUE7QUFFNUYsTUFBTSxJQUFJLEdBQVEsR0FBRyxDQUFDLElBQUksQ0FBQztBQUUzQixJQUFJLElBQUksQ0FBQyxDQUFDLElBQUksSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQ3RCLEdBQUcsQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUNmLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQztBQUNuQixDQUFDO0tBQU0sSUFBSSxJQUFJLENBQUMsQ0FBQyxJQUFJLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUNoQyxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUM7QUFDbkIsQ0FBQyJ9 \ No newline at end of file diff --git a/packages/media/types.d.ts b/packages/media/types.d.ts index 006fdb3b..dc5c7e68 100644 --- a/packages/media/types.d.ts +++ b/packages/media/types.d.ts @@ -1,52 +1,52 @@ -import { PATH_INFO } from '@plastichub/osr-commons'; -import * as sharp from 'sharp'; -export type IOptions = { - alt?: boolean; - config?: any; - cwd?: string; - root?: string; - debug?: boolean; - verbose?: boolean; - dry?: boolean; - dst: string; - dstInfo?: PATH_INFO; - env?: string; - cache?: boolean; - src: string; - srcInfo?: PATH_INFO; - stdout?: boolean; - variables?: Record; - key?: string; - logLevel?: string; -}; -export interface IResizeOptionsSharp { - /** Alternative means of specifying width. If both are present this takes priority. */ - width?: number | undefined; - /** Alternative means of specifying height. If both are present this takes priority. */ - height?: number | undefined; - /** How the image should be resized to fit both provided dimensions, one of cover, contain, fill, inside or outside. (optional, default 'cover') */ - fit?: keyof sharp.FitEnum | undefined; - /** Position, gravity or strategy to use when fit is cover or contain. (optional, default 'centre') */ - position?: number | string | undefined; - /** Background color when using a fit of contain, parsed by the color module, defaults to black without transparency. (optional, default {r:0,g:0,b:0,alpha:1}) */ - background?: sharp.Color | undefined; - /** The kernel to use for image reduction. (optional, default 'lanczos3') */ - kernel?: keyof sharp.KernelEnum | undefined; - /** Do not enlarge if the width or height are already less than the specified dimensions, equivalent to GraphicsMagick's > geometry option. (optional, default false) */ - withoutEnlargement?: boolean | undefined; - /** Do not reduce if the width or height are already greater than the specified dimensions, equivalent to GraphicsMagick's < geometry option. (optional, default false) */ - withoutReduction?: boolean | undefined; - /** Take greater advantage of the JPEG and WebP shrink-on-load feature, which can lead to a slight moiré pattern on some images. (optional, default true) */ - fastShrinkOnLoad?: boolean | undefined; -} -export type IResizeOptions = IOptions & IResizeOptionsSharp & { - percent?: number; - minWidth?: number; - minHeight?: number; - minSize?: number; -}; -export type IConvertVideoOptions = IOptions & { - interval?: number; - verb: string; - audio: string; -}; +import { PATH_INFO } from '@plastichub/osr-commons'; +import * as sharp from 'sharp'; +export type IOptions = { + alt?: boolean; + config?: any; + cwd?: string; + root?: string; + debug?: boolean; + verbose?: boolean; + dry?: boolean; + dst: string; + dstInfo?: PATH_INFO; + env?: string; + cache?: boolean; + src: string; + srcInfo?: PATH_INFO; + stdout?: boolean; + variables?: Record; + key?: string; + logLevel?: string; +}; +export interface IResizeOptionsSharp { + /** Alternative means of specifying width. If both are present this takes priority. */ + width?: number | undefined; + /** Alternative means of specifying height. If both are present this takes priority. */ + height?: number | undefined; + /** How the image should be resized to fit both provided dimensions, one of cover, contain, fill, inside or outside. (optional, default 'cover') */ + fit?: keyof sharp.FitEnum | undefined; + /** Position, gravity or strategy to use when fit is cover or contain. (optional, default 'centre') */ + position?: number | string | undefined; + /** Background color when using a fit of contain, parsed by the color module, defaults to black without transparency. (optional, default {r:0,g:0,b:0,alpha:1}) */ + background?: sharp.Color | undefined; + /** The kernel to use for image reduction. (optional, default 'lanczos3') */ + kernel?: keyof sharp.KernelEnum | undefined; + /** Do not enlarge if the width or height are already less than the specified dimensions, equivalent to GraphicsMagick's > geometry option. (optional, default false) */ + withoutEnlargement?: boolean | undefined; + /** Do not reduce if the width or height are already greater than the specified dimensions, equivalent to GraphicsMagick's < geometry option. (optional, default false) */ + withoutReduction?: boolean | undefined; + /** Take greater advantage of the JPEG and WebP shrink-on-load feature, which can lead to a slight moiré pattern on some images. (optional, default true) */ + fastShrinkOnLoad?: boolean | undefined; +} +export type IResizeOptions = IOptions & IResizeOptionsSharp & { + percent?: number; + minWidth?: number; + minHeight?: number; + minSize?: number; +}; +export type IConvertVideoOptions = IOptions & { + interval?: number; + verb: string; + audio: string; +}; diff --git a/packages/media/types.js b/packages/media/types.js index fc0e3657..93268cd0 100644 --- a/packages/media/types.js +++ b/packages/media/types.js @@ -1,3 +1,3 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJzcmMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9 \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6157ecd7..5c9478bf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -211,6 +211,9 @@ importers: tsup: specifier: ^8.3.5 version: 8.3.5(postcss@8.5.1)(typescript@5.7.3)(yaml@2.7.0) + type-fest: + specifier: ^4.34.1 + version: 4.34.1 zod: specifier: ^3.24.1 version: 3.24.1 @@ -4862,6 +4865,10 @@ packages: resolution: {integrity: sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==} engines: {node: '>=14.16'} + type-fest@4.34.1: + resolution: {integrity: sha512-6kSc32kT0rbwxD6QL1CYe8IqdzN/J/ILMrNK+HMQCKH3insCDRY/3ITb0vcBss0a3t72fzh2YSzj8ko1HgwT3g==} + engines: {node: '>=16'} + typed-array-buffer@1.0.2: resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==} engines: {node: '>= 0.4'} @@ -10376,6 +10383,8 @@ snapshots: type-fest@3.13.1: {} + type-fest@4.34.1: {} + typed-array-buffer@1.0.2: dependencies: call-bind: 1.0.7