@metamesh/cli 0.16.0 → 0.18.0

package/dist/authoring/{worker.js → execution-process.js}

@@ -6,8 +6,6 @@ function program(value) {
     return isRecord(value) && value.kind === "metamesh-model" && typeof value.generate === "function";
 }
 async function execute(request) {
-    let snapshot;
-    let dispose;
     let phase = "execute";
     try {
         const entry = await import(pathToFileURL(request.modulePath).href);
@@ -15,7 +13,7 @@ async function execute(request) {
             throw new AuthoringError("execute", "INVALID_ENTRY", "Author entry is not a module.", 1);
         let model;
         let definition;
-        let parameters = request.params;
+        let parameters = request.input;
         if (request.kind === "generator") {
             phase = "parameters";
             if (request.packagesPath === undefined || request.parametersPath === undefined)
@@ -25,13 +23,17 @@ async function execute(request) {
             definition = packages.parseGeneratorDefinition(entry.definition);
             const parsed = params
                 .createParamCodec(definition)
-                .safeParse({ ...params.getDefaultParameters(definition), ...request.params });
+                .safeParse({ ...params.getDefaultParameters(definition), ...request.input });
             if (!parsed.success)
                 return {
                     success: false,
                     phase: "parameters",
                     exitCode: 1,
-                    diagnostics: parsed.issues.map((issue) => ({ ...issue, severity: "error" })),
+                    diagnostics: parsed.issues.map(({ path, ...issue }) => ({
+                        ...issue,
+                        severity: "error",
+                        ...(path === undefined ? {} : { path }),
+                    })),
                 };
             parameters = parsed.data;
             const runtime = entry.default;
@@ -39,9 +41,9 @@ async function execute(request) {
                 runtime.formatVersion !== packages.GENERATOR_PACKAGE_FORMAT_VERSION ||
                 runtime.generatorId !== definition.id ||
                 runtime.version !== definition.version ||
-                !program(runtime.generate))
+                !program(runtime))
                 throw new AuthoringError("execute", "INVALID_GENERATOR_MODULE", "Default export must be the Generator module envelope matching definition.", 1);
-            model = runtime.generate;
+            model = runtime;
         }
         else {
             if (!program(entry.default))
@@ -66,19 +68,19 @@ async function execute(request) {
             }
         }
         phase = "execute";
-        const { createModelEngine } = (await import(pathToFileURL(request.enginePath).href));
+        const { createModelEngine, export3mf } = (await import(pathToFileURL(request.enginePath).href));
         const engine = await createModelEngine();
-        const session = services === undefined
-            ? engine.createSession(model, {
+        const snapshot = services === undefined
+            ? engine.run(model, parameters, {
                 limits: request.metadata.policy.limits,
             })
-            : engine.createSession(model, {
+            : engine.run(model, parameters, {
                 services,
                 limits: request.metadata.policy.limits,
             });
-        dispose = () => session.dispose();
-        snapshot = session.run(parameters);
-        const exported = request.export3mf ? await engine.export3mf(snapshot.parts) : undefined;
+        const exported = request.export3mf
+            ? await export3mf(snapshot.parts, { limits: engine.limits })
+            : undefined;
         phase = "artifact";
         const selectedAssets = definition === undefined
             ? (loaded?.selections ?? [])
@@ -149,10 +151,6 @@ async function execute(request) {
             ],
         };
     }
-    finally {
-        snapshot?.dispose();
-        dispose?.();
-    }
 }
 const requestFile = process.argv[2];
 const resultFile = process.argv[3];
@@ -160,4 +158,4 @@ if (requestFile !== undefined && resultFile !== undefined) {
     const result = await execute(JSON.parse(await readFile(requestFile, "utf8")));
     await writeFile(resultFile, JSON.stringify(result));
 }
-//# sourceMappingURL=worker.js.map
+//# sourceMappingURL=execution-process.js.map

package/dist/authoring/execution-process.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"execution-process.js","sourceRoot":"","sources":["../../src/authoring/execution-process.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAQzC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAiCzE,SAAS,OAAO,CAAC,KAAc;IAC7B,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,gBAAgB,IAAI,OAAO,KAAK,CAAC,QAAQ,KAAK,UAAU,CAAC;AACpG,CAAC;AAED,KAAK,UAAU,OAAO,CAAC,OAAsB;IAC3C,IAAI,KAAK,GAA8B,SAAS,CAAC;IACjD,IAAI,CAAC;QACH,MAAM,KAAK,GAAY,MAAM,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC;QAC5E,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;YAClB,MAAM,IAAI,cAAc,CAAC,SAAS,EAAE,eAAe,EAAE,+BAA+B,EAAE,CAAC,CAAC,CAAC;QAC3F,IAAI,KAEqC,CAAC;QAC1C,IAAI,UAA2C,CAAC;QAChD,IAAI,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC;QAC/B,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YACjC,KAAK,GAAG,YAAY,CAAC;YACrB,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,IAAI,OAAO,CAAC,cAAc,KAAK,SAAS;gBAC5E,MAAM,IAAI,cAAc,CACtB,aAAa,EACb,mBAAmB,EACnB,iDAAiD,CAClD,CAAC;YACJ,MAAM,QAAQ,GAAG,CAAC,MAAM,MAAM,CAC5B,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,IAAI,CACzC,CAA6B,CAAC;YAC/B,MAAM,MAAM,GAAG,CAAC,MAAM,MAAM,CAC1B,aAAa,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,IAAI,CAC3C,CAA+B,CAAC;YACjC,UAAU,GAAG,QAAQ,CAAC,wBAAwB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YACjE,MAAM,MAAM,GAAG,MAAM;iBAClB,gBAAgB,CAAC,UAAU,CAAC;iBAC5B,SAAS,CAAC,EAAE,GAAG,MAAM,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;YAC/E,IAAI,CAAC,MAAM,CAAC,OAAO;gBACjB,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,YAAY;oBACnB,QAAQ,EAAE,CAAC;oBACX,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;wBACtD,GAAG,KAAK;wBACR,QAAQ,EAAE,OAAO;wBACjB,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;qBACxC,CAAC,CAAC;iBACJ,CAAC;YACJ,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC;YACzB,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;YAC9B,IACE,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAClB,OAAO,CAAC,aAAa,KAAK,QAAQ,CAAC,gCAAgC;gBACnE,OAAO,CAAC,WAAW,KAAK,UAAU,CAAC,EAAE;gBACrC,OAAO,CAAC,OAAO,KAAK,UAAU,CAAC,OAAO;gBACtC,CAAC,OAAO,CAAC,OAAO,CAAC;gBAEjB,MAAM,IAAI,cAAc,CACtB,SAAS,EACT,0BAA0B,EAC1B,2EAA2E,EAC3E,CAAC,CACF,CAAC;YACJ,KAAK,GAAG,OAAO,CAAC;QAClB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;gBACzB,MAAM,IAAI,cAAc,CACtB,SAAS,EACT,uBAAuB,EACvB,kDAAkD,EAClD,CAAC,CACF,CAAC;YACJ,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC;QACxB,CAAC;QACD,KAAK,GAAG,QAAQ,CAAC;QACjB,MAAM,MAAM,GACV,OAAO,CAAC,YAAY,KAAK,SAAS;YAChC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,MAAM,CACJ,MAAM,MAAM,CAAC,iCAAiC,CAAC,CAChD,CAAC,gBAAgB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC/C,IAAI,QAAuC,CAAC;QAC5C,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,IAAI,MAAM,KAAK,SAAS;gBAAE,QAAQ,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;iBACrF,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,MAAM,CAAC;gBAChE,MAAM,IAAI,cAAc,CACtB,QAAQ,EACR,wBAAwB,EACxB,6EAA6E,EAC7E,CAAC,CACF,CAAC;iBACC,CAAC;gBACJ,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS;oBAC/B,MAAM,IAAI,cAAc,CACtB,aAAa,EACb,mBAAmB,EACnB,iDAAiD,CAClD,CAAC;gBACJ,QAAQ,GAAI,CAAC,MAAM,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAyB;qBACpF,6BAA6B,CAAC;YACnC,CAAC;QACH,CAAC;QACD,KAAK,GAAG,SAAS,CAAC;QAClB,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,MAAM,CACpD,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,IAAI,CACvC,CAA2B,CAAC;QAC7B,MAAM,MAAM,GAAG,MAAM,iBAAiB,EAAE,CAAC;QACzC,MAAM,QAAQ,GACZ,QAAQ,KAAK,SAAS;YACpB,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,KAA8C,EAAE,UAAU,EAAE;gBACrE,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM;aACvC,CAAC;YACJ,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE;gBAC5B,QAAQ;gBACR,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM;aACvC,CAAC,CAAC;QACT,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS;YAChC,CAAC,CAAC,MAAM,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;YAC5D,CAAC,CAAC,SAAS,CAAC;QACd,KAAK,GAAG,UAAU,CAAC;QACnB,MAAM,cAAc,GAClB,UAAU,KAAK,SAAS;YACtB,CAAC,CAAC,CAAC,MAAM,EAAE,UAAU,IAAI,EAAE,CAAC;YAC5B,CAAC,CAAE,UAAU,CAAC,UAAU;iBACnB,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,MAAM,CAAC;iBACrC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;iBAC/B,MAAM,CACL,CAAC,KAAK,EAAE,EAAE,CACR,QAAQ,CAAC,KAAK,CAAC;gBACf,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ;gBAChC,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ;gBAClC,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,CACwB,CAAC;QACrE,MAAM,QAAQ,GAAG,MAAM,eAAe,CACpC,OAAO,CAAC,SAAS,EACjB,QAAQ,EACR,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,EAC3D,QAAQ,CACT,CAAC;QACF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,cAAc;YAAE,OAAO,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACpE,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC9C,MAAM,MAAM,GAAG,KAA2C,CAAC;YAC3D,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;gBAC9B,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK;oBACL,QAAQ,EAAE,CAAC;oBACX,WAAW,EAAG,MAAM,CAAC,MAAgC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;wBACpE,GAAG,KAAK;wBACR,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,oBAAoB;wBACxC,QAAQ,EAAE,OAAO;qBAClB,CAAC,CAAC;iBACJ,CAAC;YACJ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC;gBACnC,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK;oBACL,QAAQ,EAAE,CAAC;oBACX,WAAW,EAAG,MAAM,CAAC,WAAqC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;wBACzE,GAAG,KAAK;wBACR,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,sBAAsB;qBAC3C,CAAC,CAAC;iBACJ,CAAC;YACJ,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;gBAC7D,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK;oBACL,QAAQ,EAAE,CAAC;oBACX,WAAW,EAAE;wBACX;4BACE,IAAI,EAAE,MAAM,CAAC,IAAI;4BACjB,QAAQ,EAAE,OAAO;4BACjB,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB;4BACpE,OAAO,EAAE,MAAM,CAAC,OAAO;yBACxB;qBACF;iBACF,CAAC;QACN,CAAC;QACD,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK;YACL,QAAQ,EAAE,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACtC,WAAW,EAAE;gBACX;oBACE,IAAI,EAAE,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,kBAAkB;oBAC1E,QAAQ,EAAE,OAAO;oBACjB,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;oBAC/D,GAAG,CAAC,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS;wBACrD,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,EAAE;wBACrC,CAAC,CAAC,EAAE,CAAC;iBACR;aACF;SACF,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACpC,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACnC,IAAI,WAAW,KAAK,SAAS,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;IAC1D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CAAkB,CAAC,CAAC;IAC/F,MAAM,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;AACtD,CAAC"}