@meshy-ai/cli 0.5.0 → 0.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -3
- package/dist/client/endpoints/balance.d.ts +4 -3
- package/dist/client/endpoints/balance.d.ts.map +1 -1
- package/dist/client/endpoints/balance.js +10 -12
- package/dist/client/endpoints/balance.js.map +1 -1
- package/dist/client/endpoints/base.d.ts +0 -2
- package/dist/client/endpoints/base.d.ts.map +1 -1
- package/dist/client/endpoints/base.js.map +1 -1
- package/dist/client/index.d.ts +0 -6
- package/dist/client/index.d.ts.map +1 -1
- package/dist/client/index.js +2 -22
- package/dist/client/index.js.map +1 -1
- package/dist/client/resource-registry.d.ts +2 -9
- package/dist/client/resource-registry.d.ts.map +1 -1
- package/dist/client/resource-registry.js +5 -14
- package/dist/client/resource-registry.js.map +1 -1
- package/dist/client/transport.d.ts +1 -1
- package/dist/client/transport.d.ts.map +1 -1
- package/dist/client/types.d.ts +4 -8
- package/dist/client/types.d.ts.map +1 -1
- package/dist/client/types.js +4 -3
- package/dist/client/types.js.map +1 -1
- package/dist/cmd/creative-lab.d.ts +0 -2
- package/dist/cmd/creative-lab.d.ts.map +1 -1
- package/dist/cmd/creative-lab.js +0 -4
- package/dist/cmd/creative-lab.js.map +1 -1
- package/dist/cmd/download.d.ts +1 -1
- package/dist/cmd/download.js +2 -2
- package/dist/cmd/download.js.map +1 -1
- package/dist/cmd/image-to-3d.d.ts +3 -3
- package/dist/cmd/image-to-3d.d.ts.map +1 -1
- package/dist/cmd/image-to-3d.js +16 -45
- package/dist/cmd/image-to-3d.js.map +1 -1
- package/dist/cmd/image-to-image.d.ts.map +1 -1
- package/dist/cmd/image-to-image.js +2 -1
- package/dist/cmd/image-to-image.js.map +1 -1
- package/dist/cmd/inspect.d.ts +12 -4
- package/dist/cmd/inspect.d.ts.map +1 -1
- package/dist/cmd/inspect.js +59 -35
- package/dist/cmd/inspect.js.map +1 -1
- package/dist/cmd/make.d.ts.map +1 -1
- package/dist/cmd/make.js +22 -15
- package/dist/cmd/make.js.map +1 -1
- package/dist/cmd/mesh.d.ts +3 -3
- package/dist/cmd/mesh.js +3 -3
- package/dist/cmd/multi-image-to-3d.d.ts +2 -3
- package/dist/cmd/multi-image-to-3d.d.ts.map +1 -1
- package/dist/cmd/multi-image-to-3d.js +10 -28
- package/dist/cmd/multi-image-to-3d.js.map +1 -1
- package/dist/cmd/project.d.ts.map +1 -1
- package/dist/cmd/project.js +3 -5
- package/dist/cmd/project.js.map +1 -1
- package/dist/cmd/resources.d.ts.map +1 -1
- package/dist/cmd/resources.js +0 -1
- package/dist/cmd/resources.js.map +1 -1
- package/dist/cmd/retexture.d.ts +2 -2
- package/dist/cmd/retexture.js +2 -2
- package/dist/cmd/text-to-3d.d.ts +1 -1
- package/dist/cmd/text-to-3d.js +1 -1
- package/dist/cmd/text-to-image.d.ts.map +1 -1
- package/dist/cmd/text-to-image.js +3 -2
- package/dist/cmd/text-to-image.js.map +1 -1
- package/dist/cmd/uv-unwrap.d.ts +0 -1
- package/dist/cmd/uv-unwrap.d.ts.map +1 -1
- package/dist/cmd/uv-unwrap.js +0 -1
- package/dist/cmd/uv-unwrap.js.map +1 -1
- package/dist/index.js +4 -6
- package/dist/index.js.map +1 -1
- package/dist/internal/artifacts.d.ts +18 -9
- package/dist/internal/artifacts.d.ts.map +1 -1
- package/dist/internal/artifacts.js +56 -30
- package/dist/internal/artifacts.js.map +1 -1
- package/dist/internal/config.d.ts +3 -3
- package/dist/internal/config.js +3 -3
- package/dist/internal/doctor.d.ts +0 -2
- package/dist/internal/doctor.d.ts.map +1 -1
- package/dist/internal/doctor.js +0 -4
- package/dist/internal/doctor.js.map +1 -1
- package/dist/internal/download.d.ts +34 -50
- package/dist/internal/download.d.ts.map +1 -1
- package/dist/internal/download.js +83 -331
- package/dist/internal/download.js.map +1 -1
- package/dist/internal/file-input.d.ts +0 -12
- package/dist/internal/file-input.d.ts.map +1 -1
- package/dist/internal/file-input.js +2 -49
- package/dist/internal/file-input.js.map +1 -1
- package/dist/internal/global-options.d.ts +4 -1
- package/dist/internal/global-options.d.ts.map +1 -1
- package/dist/internal/global-options.js +9 -5
- package/dist/internal/global-options.js.map +1 -1
- package/dist/internal/image-models.d.ts +7 -0
- package/dist/internal/image-models.d.ts.map +1 -1
- package/dist/internal/image-models.js +14 -0
- package/dist/internal/image-models.js.map +1 -1
- package/dist/internal/inspect.d.ts +31 -6
- package/dist/internal/inspect.d.ts.map +1 -1
- package/dist/internal/inspect.js +124 -11
- package/dist/internal/inspect.js.map +1 -1
- package/dist/internal/logger.d.ts +0 -1
- package/dist/internal/logger.d.ts.map +1 -1
- package/dist/internal/logger.js +0 -3
- package/dist/internal/logger.js.map +1 -1
- package/dist/internal/material-links.d.ts +0 -2
- package/dist/internal/material-links.d.ts.map +1 -1
- package/dist/internal/material-links.js +0 -4
- package/dist/internal/material-links.js.map +1 -1
- package/dist/internal/obj-transform.d.ts +1 -1
- package/dist/internal/obj-transform.js +1 -1
- package/dist/internal/paths.d.ts +2 -0
- package/dist/internal/paths.d.ts.map +1 -1
- package/dist/internal/paths.js +4 -0
- package/dist/internal/paths.js.map +1 -1
- package/dist/internal/pricing.d.ts +1 -1
- package/dist/internal/pricing.d.ts.map +1 -1
- package/dist/internal/pricing.js +1 -1
- package/dist/internal/pricing.js.map +1 -1
- package/dist/internal/project-store.d.ts +6 -13
- package/dist/internal/project-store.d.ts.map +1 -1
- package/dist/internal/project-store.js +23 -27
- package/dist/internal/project-store.js.map +1 -1
- package/dist/internal/runtime.d.ts +3 -11
- package/dist/internal/runtime.d.ts.map +1 -1
- package/dist/internal/runtime.js +12 -28
- package/dist/internal/runtime.js.map +1 -1
- package/dist/internal/slicers.d.ts +7 -8
- package/dist/internal/slicers.d.ts.map +1 -1
- package/dist/internal/slicers.js +5 -6
- package/dist/internal/slicers.js.map +1 -1
- package/dist/internal/task-command.d.ts +13 -3
- package/dist/internal/task-command.d.ts.map +1 -1
- package/dist/internal/task-command.js +17 -14
- package/dist/internal/task-command.js.map +1 -1
- package/dist/internal/task-view.js +1 -1
- package/dist/internal/task-view.js.map +1 -1
- package/dist/internal/texturing.d.ts +17 -0
- package/dist/internal/texturing.d.ts.map +1 -0
- package/dist/internal/texturing.js +30 -0
- package/dist/internal/texturing.js.map +1 -0
- package/dist/internal/update-notifier.d.ts.map +1 -1
- package/dist/internal/update-notifier.js.map +1 -1
- package/dist/internal/views.d.ts +5 -6
- package/dist/internal/views.d.ts.map +1 -1
- package/dist/internal/views.js +42 -25
- package/dist/internal/views.js.map +1 -1
- package/dist/root.d.ts.map +1 -1
- package/dist/root.js +6 -4
- package/dist/root.js.map +1 -1
- package/package.json +1 -1
- package/skills/meshy-cli/SKILL.md +18 -11
package/dist/internal/runtime.js
CHANGED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
* credential or network: never touches the credential
|
|
11
11
|
* store, never refreshes anything.
|
|
12
12
|
*/
|
|
13
|
-
import { freezeRoot } from "./paths.js";
|
|
13
|
+
import { freezeRoot, looksLikeFile } from "./paths.js";
|
|
14
14
|
import { MeshyClient } from "../client/index.js";
|
|
15
15
|
import { loadConfig } from "./config.js";
|
|
16
16
|
import { credentialsPath, readCredentials, saveProfile } from "./credentials.js";
|
|
@@ -151,6 +151,14 @@ export function readGlobalFlags(cmd) {
|
|
|
151
151
|
if (opts.envFile !== undefined) {
|
|
152
152
|
throw new UsageError("--env-file is intercepted by Node.js itself (it loads the whole file into the environment before meshy-cli starts and exits 9 when the file is missing). Use --api-key-file <path>; only MESHY_API_KEY is read from it.");
|
|
153
153
|
}
|
|
154
|
+
// --all-assets only widens what -o saves into a directory; anywhere else it
|
|
155
|
+
// would be silently ignored, so it is refused before any request.
|
|
156
|
+
if (opts.allAssets && !opts.output) {
|
|
157
|
+
throw new UsageError("--all-assets only changes what -o/--output <dir> saves; pass it together with -o (meshy download selects with --all)");
|
|
158
|
+
}
|
|
159
|
+
if (opts.allAssets && opts.output && looksLikeFile(opts.output)) {
|
|
160
|
+
throw new UsageError(`--all-assets saves every file of the task and needs a directory — '${opts.output}' looks like a file`);
|
|
161
|
+
}
|
|
154
162
|
// --json is an alias for --format json; --json wins if both are set.
|
|
155
163
|
// Untyped --format resolves against the TTY (see output.ts); remember that it
|
|
156
164
|
// was untyped, because a file write must stay JSON no matter what the
|
|
@@ -165,8 +173,8 @@ export function readGlobalFlags(cmd) {
|
|
|
165
173
|
format,
|
|
166
174
|
formatExplicit,
|
|
167
175
|
json: opts.json,
|
|
168
|
-
outputSchema: normalizeSchema(opts.outputSchema),
|
|
169
176
|
output: opts.output,
|
|
177
|
+
allAssets: opts.allAssets === true,
|
|
170
178
|
envFile: opts.apiKeyFile,
|
|
171
179
|
workspace: opts.workspace,
|
|
172
180
|
workspaceRoot: opts.workspace ? freezeRoot(opts.workspace, { label: "--workspace" }) : undefined,
|
|
@@ -175,38 +183,14 @@ export function readGlobalFlags(cmd) {
|
|
|
175
183
|
logLevel: normalizeLogLevel(opts.logLevel),
|
|
176
184
|
};
|
|
177
185
|
}
|
|
178
|
-
/**
|
|
179
|
-
* `--json` wins; a typed `--format` is honoured; untyped follows the TTY.
|
|
180
|
-
*
|
|
181
|
-
* D-065: an untyped format with a typed `--output-schema v1` is JSON even on a
|
|
182
|
-
* TTY. No person types a schema version — that is a machine asking for the
|
|
183
|
-
* envelope (an agent in a pseudo-terminal, or copying a skill example). It
|
|
184
|
-
* leaves formatExplicit false, so `-o` keeps its own rule.
|
|
185
|
-
*/
|
|
186
|
+
/** `--json` wins; a typed `--format` is honoured; untyped follows the TTY. */
|
|
186
187
|
export function resolveFormat(opts, isTTY = Boolean(process.stdout.isTTY)) {
|
|
187
188
|
if (opts.json)
|
|
188
189
|
return "json";
|
|
189
190
|
if (opts.format === undefined)
|
|
190
|
-
return
|
|
191
|
+
return defaultOutputFormat(isTTY);
|
|
191
192
|
return parseOutputFormat(opts.format);
|
|
192
193
|
}
|
|
193
|
-
/**
|
|
194
|
-
* `--output-schema` survives only as a compatibility no-op: since 0.5.0 every
|
|
195
|
-
* command prints the meshy.cli/v1 envelope. `legacy` names the removed data
|
|
196
|
-
* model, so it is refused with the migration in the message rather than
|
|
197
|
-
* silently honoured as v1.
|
|
198
|
-
*/
|
|
199
|
-
function normalizeSchema(raw) {
|
|
200
|
-
if (raw === undefined)
|
|
201
|
-
return undefined;
|
|
202
|
-
const v = raw.toLowerCase();
|
|
203
|
-
if (v === "v1")
|
|
204
|
-
return v;
|
|
205
|
-
if (v === "legacy") {
|
|
206
|
-
throw new UsageError("--output-schema legacy was removed in 0.5.0: every command prints the meshy.cli/v1 envelope (schema_version, command, ok, result, error, warnings). Drop the flag and read `result`");
|
|
207
|
-
}
|
|
208
|
-
throw new UsageError(`invalid --output-schema '${raw}'. Only v1 is accepted (the default; the flag is a no-op)`);
|
|
209
|
-
}
|
|
210
194
|
function normalizeLogLevel(raw) {
|
|
211
195
|
if (!raw)
|
|
212
196
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../src/internal/runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,UAAU,EAAuB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../src/internal/runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,UAAU,EAAE,aAAa,EAAuB,MAAM,YAAY,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,UAAU,EAA0C,MAAM,aAAa,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAqB,MAAM,aAAa,CAAC;AAmCxF,2EAA2E;AAC3E,MAAM,eAAe,GAAG,MAAM,CAAC;AAE/B;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,MAAmB,EACnB,SAA0B;IAE1B,IAAI,MAAM,CAAC,gBAAgB,KAAK,MAAM,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC;QACpE,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,QAAQ,GAAG,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAE3D,IACE,CAAC,OAAO;QACR,OAAO,CAAC,IAAI,KAAK,OAAO;QACxB,CAAC,OAAO,CAAC,aAAa;QACtB,CAAC,OAAO,CAAC,YAAY,EACrB,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,IAAI,CAAC,CAAC;IAC1C,MAAM,YAAY,GAAG,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,eAAe,CAAC;IAC9D,IAAI,CAAC,YAAY;QAAE,OAAO,MAAM,CAAC;IAEjC,MAAM,cAAc,GAAG,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;IAC/C,+DAA+D;IAC/D,oDAAoD;IACpD,MAAM,mBAAmB,GAAG,OAAO,CAAC,YAAY,CAAC;IACjD,MAAM,WAAW,GAAG,MAAM,CAAC,iBAAiB,CAAC;IAE7C,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC;YAC9B,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,YAAY,EAAE,OAAO,CAAC,aAAa;SACpC,CAAC,CAAC;QACH,mEAAmE;QACnE,WAAW,CACT,QAAQ,EACR,WAAW,EACX;YACE,IAAI,EAAE,OAAO;YACb,YAAY,EAAE,GAAG,CAAC,YAAY;YAC9B,aAAa,EAAE,GAAG,CAAC,aAAa;YAChC,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,UAAU,GAAG,IAAI;YAC9C,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO;YACvC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3D,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,EACD,EAAE,UAAU,EAAE,KAAK,EAAE,CACtB,CAAC;QACF,2DAA2D;QAC3D,OAAO,UAAU,CAAC,SAAS,CAAC,CAAC;IAC/B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,iEAAiE;QACjE,kEAAkE;QAClE,gEAAgE;QAChE,iEAAiE;QACjE,wDAAwD;QACxD,MAAM,YAAY,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;QAC/C,MAAM,YAAY,GAAG,WAAW,CAAC,CAAC,CAAC,YAAY,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnF,IACE,YAAY,EAAE,IAAI,KAAK,OAAO;YAC9B,YAAY,CAAC,YAAY;YACzB,YAAY,CAAC,YAAY,KAAK,mBAAmB;YACjD,CAAC,YAAY,CAAC,UAAU,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,eAAe,EAC7D,CAAC;YACD,yDAAyD;YACzD,MAAM,CAAC,KAAK,CAAC,2EAA2E,CAAC,CAAC;YAC1F,OAAO,UAAU,CAAC,SAAS,CAAC,CAAC;QAC/B,CAAC;aAAM,IAAI,cAAc,EAAE,CAAC;YAC1B,MAAM,iBAAiB,CACrB,+DAA+D,CAChE,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,gEAAgE;YAChE,MAAM,CAAC,KAAK,CAAC,sDAAsD,EAAE,GAAG,CAAC,CAAC;YAC1E,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,KAAkB;IACpD,OAAO;QACL,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;QAC5C,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ;KACnD,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,KAAkB;IACnD,MAAM,SAAS,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,MAAM,8BAA8B,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,CAAC;IACtF,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC;IACvC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AACnC,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,iBAAiB,CAAC,KAAkB;IAClD,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IACnE,MAAM,QAAQ,GACZ,QAAQ,KAAK,OAAO,IAAI,QAAQ,KAAK,MAAM,IAAI,QAAQ,KAAK,MAAM,IAAI,QAAQ,KAAK,OAAO,IAAI,QAAQ,KAAK,QAAQ;QACjH,CAAC,CAAE,QAAqB;QACxB,CAAC,CAAC,MAAM,CAAC;IACb,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,IAAI,QAAQ,CAAC,CAAC;IAClE,OAAO,EAAE,KAAK,EAAE,CAAC;AACnB,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,eAAe,CAAC,GAAY;IAC1C,MAAM,IAAI,GAAG,GAAG,CAAC,eAAe,EAe5B,CAAC;IACL,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,IAAI,UAAU,CAClB,yNAAyN,CAC1N,CAAC;IACJ,CAAC;IACD,4EAA4E;IAC5E,kEAAkE;IAClE,IAAI,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACnC,MAAM,IAAI,UAAU,CAAC,sHAAsH,CAAC,CAAC;IAC/I,CAAC;IACD,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM,IAAI,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAChE,MAAM,IAAI,UAAU,CAAC,sEAAsE,IAAI,CAAC,MAAM,qBAAqB,CAAC,CAAC;IAC/H,CAAC;IACD,qEAAqE;IACrE,8EAA8E;IAC9E,sEAAsE;IACtE,6BAA6B;IAC7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC;IACvE,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACnC,OAAO;QACL,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;QAC3C,MAAM;QACN,cAAc;QACd,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,SAAS,EAAE,IAAI,CAAC,SAAS,KAAK,IAAI;QAClC,OAAO,EAAE,IAAI,CAAC,UAAU;QACxB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;QAChG,WAAW,EAAE,IAAI,CAAC,WAAW,KAAK,KAAK;QACvC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;QAC9B,QAAQ,EAAE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC;KAC3C,CAAC;AACJ,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,aAAa,CAC3B,IAAyC,EACzC,KAAK,GAAY,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;IAE9C,IAAI,IAAI,CAAC,IAAI;QAAE,OAAO,MAAM,CAAC;IAC7B,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS;QAAE,OAAO,mBAAmB,CAAC,KAAK,CAAC,CAAC;IACjE,OAAO,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACxC,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAuB;IAChD,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAC3B,MAAM,CAAC,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;IAC5B,IAAI,CAAC,KAAK,OAAO,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC,KAAK,OAAO,IAAI,CAAC,KAAK,QAAQ;QAAE,OAAO,CAAC,CAAC;IAC/F,MAAM,IAAI,KAAK,CAAC,wBAAwB,GAAG,mDAAmD,CAAC,CAAC;AAClG,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Slicer registry, detection and launch
|
|
2
|
+
* Slicer registry, detection and launch.
|
|
3
3
|
*
|
|
4
|
-
* Seven slicers are registered with
|
|
4
|
+
* Seven slicers are registered with their usual install locations; the
|
|
5
5
|
* `multicolor` flag is capability metadata only (the slicer can drive
|
|
6
6
|
* multi-material prints — it says nothing about a particular printer).
|
|
7
7
|
*
|
|
@@ -11,14 +11,13 @@
|
|
|
11
11
|
* Windows — `<ProgramFiles | ProgramFiles(x86)>\<dir>\<exe>`, where a `*`
|
|
12
12
|
* suffix on the registered directory matches versioned installs
|
|
13
13
|
* ("Creality Print 5.1", "UltiMaker Cura 5.7")
|
|
14
|
-
* Linux — the three
|
|
14
|
+
* Linux — the three slicers with a known executable, on PATH; the other
|
|
15
15
|
* four are reported as unsupported instead of guessed
|
|
16
16
|
*
|
|
17
17
|
* Launching only ever runs the detected path (or `open -a <bundle>` on macOS)
|
|
18
18
|
* with the model file as a single argv element: no shell, no string commands,
|
|
19
|
-
* no default-application fallback.
|
|
20
|
-
*
|
|
21
|
-
* what the detected absolute path avoids. A spawn that fails is an error; a
|
|
19
|
+
* no default-application fallback. Running the detected absolute path means a
|
|
20
|
+
* same-named exe elsewhere on PATH is never the one launched. A spawn that fails is an error; a
|
|
22
21
|
* spawn that succeeds is `launch_requested`, never proof that the slicer
|
|
23
22
|
* imported the file. On macOS the short-lived `open` helper is awaited (bounded)
|
|
24
23
|
* for its exit status; GUI processes are never awaited.
|
|
@@ -27,7 +26,7 @@ import type { EventEmitter } from "node:events";
|
|
|
27
26
|
export interface SlicerDescriptor {
|
|
28
27
|
/** Stable slug for scripts (`orca-slicer`). */
|
|
29
28
|
id: string;
|
|
30
|
-
/** Display name, as the
|
|
29
|
+
/** Display name, as the slicer spells itself (`OrcaSlicer`). */
|
|
31
30
|
name: string;
|
|
32
31
|
/** macOS bundle name without `.app`. */
|
|
33
32
|
macApp: string;
|
|
@@ -35,7 +34,7 @@ export interface SlicerDescriptor {
|
|
|
35
34
|
winExe: string;
|
|
36
35
|
/** Windows directory under Program Files; a trailing `*` matches a version suffix. */
|
|
37
36
|
winDir: string;
|
|
38
|
-
/** Linux executable expected on PATH, or null when
|
|
37
|
+
/** Linux executable expected on PATH, or null when none is known. */
|
|
39
38
|
linuxExe: string | null;
|
|
40
39
|
/** Capability metadata: the slicer supports multi-material / multi-colour prints. */
|
|
41
40
|
multicolor: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slicers.d.ts","sourceRoot":"","sources":["../../src/internal/slicers.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"slicers.d.ts","sourceRoot":"","sources":["../../src/internal/slicers.ts"],"names":[],"mappings":"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"}
|
package/dist/internal/slicers.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Slicer registry, detection and launch
|
|
2
|
+
* Slicer registry, detection and launch.
|
|
3
3
|
*
|
|
4
|
-
* Seven slicers are registered with
|
|
4
|
+
* Seven slicers are registered with their usual install locations; the
|
|
5
5
|
* `multicolor` flag is capability metadata only (the slicer can drive
|
|
6
6
|
* multi-material prints — it says nothing about a particular printer).
|
|
7
7
|
*
|
|
@@ -11,14 +11,13 @@
|
|
|
11
11
|
* Windows — `<ProgramFiles | ProgramFiles(x86)>\<dir>\<exe>`, where a `*`
|
|
12
12
|
* suffix on the registered directory matches versioned installs
|
|
13
13
|
* ("Creality Print 5.1", "UltiMaker Cura 5.7")
|
|
14
|
-
* Linux — the three
|
|
14
|
+
* Linux — the three slicers with a known executable, on PATH; the other
|
|
15
15
|
* four are reported as unsupported instead of guessed
|
|
16
16
|
*
|
|
17
17
|
* Launching only ever runs the detected path (or `open -a <bundle>` on macOS)
|
|
18
18
|
* with the model file as a single argv element: no shell, no string commands,
|
|
19
|
-
* no default-application fallback.
|
|
20
|
-
*
|
|
21
|
-
* what the detected absolute path avoids. A spawn that fails is an error; a
|
|
19
|
+
* no default-application fallback. Running the detected absolute path means a
|
|
20
|
+
* same-named exe elsewhere on PATH is never the one launched. A spawn that fails is an error; a
|
|
22
21
|
* spawn that succeeds is `launch_requested`, never proof that the slicer
|
|
23
22
|
* imported the file. On macOS the short-lived `open` helper is awaited (bounded)
|
|
24
23
|
* for its exit status; GUI processes are never awaited.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slicers.js","sourceRoot":"","sources":["../../src/internal/slicers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"slicers.js","sourceRoot":"","sources":["../../src/internal/slicers.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,7 @@ import type { MeshyClient } from "../client/index.js";
|
|
|
25
25
|
import { type TaskResourceDescriptor } from "../client/resource-registry.js";
|
|
26
26
|
import type { Task } from "../client/types.js";
|
|
27
27
|
import { type SavedJson } from "./command-helpers.js";
|
|
28
|
+
import { type SkippedAsset } from "./download.js";
|
|
28
29
|
import { CliError, type Warning } from "./errors.js";
|
|
29
30
|
import type { MaterialLinkReport } from "./material-links.js";
|
|
30
31
|
import { type PollResult } from "./poll.js";
|
|
@@ -39,10 +40,11 @@ export interface CreateSpec {
|
|
|
39
40
|
toPayload(opts: Record<string, unknown>): Record<string, unknown>;
|
|
40
41
|
/**
|
|
41
42
|
* Pinned CLI defaults — the weakest payload layer, overridable by --data
|
|
42
|
-
* and by explicit flags. Computed defaults may read
|
|
43
|
-
* not throw (validation belongs in toPayload
|
|
43
|
+
* and by explicit flags. Computed defaults may read the options and the
|
|
44
|
+
* parsed --data but must not throw (validation belongs in toPayload or
|
|
45
|
+
* validatePayload).
|
|
44
46
|
*/
|
|
45
|
-
toDefaults?(opts: Record<string, unknown>): Record<string, unknown>;
|
|
47
|
+
toDefaults?(opts: Record<string, unknown>, data: Record<string, unknown>): Record<string, unknown>;
|
|
46
48
|
/**
|
|
47
49
|
* Payload keys holding nested option objects that must merge field by field
|
|
48
50
|
* across defaults < --data < flags (e.g. Creative Lab `options`, `output`).
|
|
@@ -54,6 +56,12 @@ export interface CreateSpec {
|
|
|
54
56
|
* normalised and before anything is sent. Throw UsageError / CliError.
|
|
55
57
|
*/
|
|
56
58
|
validatePayload?(payload: Record<string, unknown>, opts: Record<string, unknown>): void;
|
|
59
|
+
/**
|
|
60
|
+
* Notes about the merged payload that do not stop the request — something
|
|
61
|
+
* the API will do differently from what was asked. They ride in the
|
|
62
|
+
* envelope's warnings.
|
|
63
|
+
*/
|
|
64
|
+
warnPayload?(payload: Record<string, unknown>): Warning[];
|
|
57
65
|
}
|
|
58
66
|
export interface ResourceCommandSpec {
|
|
59
67
|
/** Registry id of the task resource this command drives. */
|
|
@@ -79,6 +87,8 @@ export interface DownloadOutcome {
|
|
|
79
87
|
error?: string | null;
|
|
80
88
|
}>;
|
|
81
89
|
metadata_path: string | null;
|
|
90
|
+
/** Artifacts `-o` left on the server (without --all-assets), with the reason; meta.json keeps their URLs. */
|
|
91
|
+
skipped?: SkippedAsset[];
|
|
82
92
|
/** OBJ/MTL/texture reference report when the download contained a text OBJ. */
|
|
83
93
|
material_links?: MaterialLinkReport | null;
|
|
84
94
|
/** Set when the transfers landed but a later step (relink | digest | sidecar) failed or was interrupted. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-command.d.ts","sourceRoot":"","sources":["../../src/internal/task-command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAuB,KAAK,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAElG,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAA8E,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"task-command.d.ts","sourceRoot":"","sources":["../../src/internal/task-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,9 +25,10 @@ import { requireTaskResource } from "../client/resource-registry.js";
|
|
|
25
25
|
import { TransportError } from "../client/transport.js";
|
|
26
26
|
import { emitResult, openCommand, rejectOutputFlag, saveRawJson } from "./command-helpers.js";
|
|
27
27
|
import { abortSignal, wasInterrupted } from "./context.js";
|
|
28
|
-
import {
|
|
28
|
+
import { downloadTaskAssets } from "./download.js";
|
|
29
29
|
import { classifyError, CliError, UsageError } from "./errors.js";
|
|
30
30
|
import { normalizeMediaPayload } from "./file-input.js";
|
|
31
|
+
import { allAssetsOption, outputOption } from "./global-options.js";
|
|
31
32
|
import { logger } from "./logger.js";
|
|
32
33
|
import { mergeNestedObjects, mergePayload, parseJsonFlag } from "./payload.js";
|
|
33
34
|
import { emitEnvelope, emitStreamEvent } from "./output.js";
|
|
@@ -39,11 +40,13 @@ import { streamTask } from "./stream.js";
|
|
|
39
40
|
import { toTaskView } from "./task-view.js";
|
|
40
41
|
import { beginOperation, credentialBinding, credentialFingerprint, newOperationId, operationsRoot, payloadFingerprint, updateOperation, } from "./operation-store.js";
|
|
41
42
|
import { originOf } from "./config.js";
|
|
42
|
-
import {
|
|
43
|
+
import { freezeRoot, looksLikeFile, resolveWithinRoot } from "./paths.js";
|
|
43
44
|
import { assertProjectMetadataPresent, indexRootFor, projectRecordCommand, recordTask, saveTaskSnapshot, stageFromTaskType } from "./project-store.js";
|
|
44
45
|
import { existsSync } from "node:fs";
|
|
45
46
|
import { dirname, join, resolve as resolvePath } from "node:path";
|
|
46
47
|
const TASK_JSON_OPTIONS = (cmd) => cmd
|
|
48
|
+
.addOption(outputOption())
|
|
49
|
+
.addOption(allAssetsOption())
|
|
47
50
|
.option("--save-json <file>", "save the full task JSON as received (never overwrites)")
|
|
48
51
|
.option("--include-raw", "include the untouched task response under result.task.raw")
|
|
49
52
|
.option("--project <dir>", "initialised meshy_output project: save task_<id>.json there and record the task in metadata.json")
|
|
@@ -188,7 +191,7 @@ function attachToProject(opts, opened, descriptor, taskId, task, raw, extra, war
|
|
|
188
191
|
stage,
|
|
189
192
|
resource: descriptor.id,
|
|
190
193
|
taskType: task?.type ?? null,
|
|
191
|
-
endpoint: descriptor.
|
|
194
|
+
endpoint: descriptor.endpoint,
|
|
192
195
|
parentTaskId: parentTaskIdFromPayload(extra.payload ?? null),
|
|
193
196
|
status: task?.status ?? null,
|
|
194
197
|
taskJson: null,
|
|
@@ -220,8 +223,6 @@ function attachToProject(opts, opened, descriptor, taskId, task, raw, extra, war
|
|
|
220
223
|
const rec = recordTask(located, input, { root: indexRoot.root, skipIndex: indexRoot.skipIndex });
|
|
221
224
|
if (!rec.index.updated)
|
|
222
225
|
warnings.push(warning("index_dirty", `metadata.json committed but history.json was not updated: ${rec.index.error}; run \`meshy project rebuild-index\``));
|
|
223
|
-
if (rec.migrated_from_legacy)
|
|
224
|
-
warnings.push(warning("metadata_migrated", "legacy metadata.json migrated to schema_version 2 (backup kept beside it)"));
|
|
225
226
|
return { project_dir: projectDir, snapshot: snapshot?.path ?? null, stage, action: rec.action, index: rec.index };
|
|
226
227
|
}
|
|
227
228
|
catch (err) {
|
|
@@ -360,20 +361,22 @@ export function buildResourceCommand(spec) {
|
|
|
360
361
|
// 1. Build and validate the payload — every local failure happens here, before the journal and the POST.
|
|
361
362
|
const data = parseJsonFlag(opts.data, "--data");
|
|
362
363
|
const flagPayload = spec.create.toPayload(opts);
|
|
363
|
-
const defaults = spec.create.toDefaults?.(opts) ?? {};
|
|
364
|
+
const defaults = spec.create.toDefaults?.(opts, data) ?? {};
|
|
364
365
|
const layers = [defaults, data, flagPayload];
|
|
365
366
|
let merged = mergePayload(...layers);
|
|
366
367
|
if (spec.create.nestedObjectKeys && spec.create.nestedObjectKeys.length > 0) {
|
|
367
368
|
merged = mergeNestedObjects(merged, layers, spec.create.nestedObjectKeys);
|
|
368
369
|
}
|
|
369
370
|
spec.create.validatePayload?.(merged, opts);
|
|
371
|
+
const payloadWarnings = spec.create.warnPayload?.(merged) ?? [];
|
|
370
372
|
const { payload } = await normalizeMediaPayload(merged, descriptor.mediaFields, { signal: abortSignal() });
|
|
371
373
|
logger.debug("create payload", redactForLog(payload));
|
|
372
374
|
// 2. Local targets that would fail after the POST are refused before it.
|
|
373
375
|
preflightLocalTargets(opts, opened);
|
|
374
376
|
// 3. Journal, then exactly one POST.
|
|
375
377
|
const submitted = await submitCreate(runtime, descriptor, endpoint, payload, opts.operationId ?? null);
|
|
376
|
-
const { taskId, raw: createRaw, operationId
|
|
378
|
+
const { taskId, raw: createRaw, operationId } = submitted;
|
|
379
|
+
const warnings = [...payloadWarnings, ...submitted.warnings];
|
|
377
380
|
const submission = { state: "accepted", operation_id: operationId, task_id: taskId, request_id: submitted.requestId };
|
|
378
381
|
if (runAsync) {
|
|
379
382
|
const ctx = { descriptor, taskId, task: null, raw: null, submission, includeRaw };
|
|
@@ -460,7 +463,7 @@ export function buildResourceCommand(spec) {
|
|
|
460
463
|
throw deleteFailure(err, taskId, nextCommands(descriptor, taskId).wait);
|
|
461
464
|
}
|
|
462
465
|
const outcome = cancels ? { deleted: false, canceled: true } : { deleted: true };
|
|
463
|
-
await emitResult(opened, { resource: spec.name, endpoint: descriptor.
|
|
466
|
+
await emitResult(opened, { resource: spec.name, endpoint: descriptor.endpoint, task_id: taskId, ...outcome, response: raw ?? null });
|
|
464
467
|
});
|
|
465
468
|
// list
|
|
466
469
|
if (spec.supportsList !== false && descriptor.supports.list) {
|
|
@@ -569,7 +572,7 @@ export async function submitCreate(runtime, descriptor, endpoint, payload, reque
|
|
|
569
572
|
const credential = credentialIdentityFor(runtime, apiOrigin);
|
|
570
573
|
const identity = {
|
|
571
574
|
resource: descriptor.id,
|
|
572
|
-
endpoint: descriptor.
|
|
575
|
+
endpoint: descriptor.endpoint,
|
|
573
576
|
apiOrigin,
|
|
574
577
|
credentialFingerprint: credential.fingerprint,
|
|
575
578
|
credentialVerified: credential.verified,
|
|
@@ -703,8 +706,8 @@ function attachSubmission(err, submission, warnings) {
|
|
|
703
706
|
return err;
|
|
704
707
|
}
|
|
705
708
|
/**
|
|
706
|
-
* `-o`:
|
|
707
|
-
* confined to the workspace when one is set. A failure keeps the task in the
|
|
709
|
+
* `-o`: save a SUCCEEDED task's default selection (every asset with
|
|
710
|
+
* --all-assets), confined to the workspace when one is set. A failure keeps the task in the
|
|
708
711
|
* result — the assets are still on the server, the task still exists.
|
|
709
712
|
*/
|
|
710
713
|
async function maybeDownloadV1(opened, descriptor, task, raw, submission, warnings, ctx) {
|
|
@@ -714,14 +717,14 @@ async function maybeDownloadV1(opened, descriptor, task, raw, submission, warnin
|
|
|
714
717
|
if (task.status !== "SUCCEEDED")
|
|
715
718
|
return { state: "not_ready", files: [], metadata_path: null };
|
|
716
719
|
try {
|
|
717
|
-
const { files, metadataPath, materialLinks } = await withSpinner(opened.format, "Downloading assets", () =>
|
|
718
|
-
|
|
719
|
-
warnings.push(...materialLinks.warnings);
|
|
720
|
+
const { files, metadataPath, materialLinks, skipped, warnings: transferWarnings } = await withSpinner(opened.format, "Downloading assets", () => downloadTaskAssets(task, output, descriptor, { root: opened.flags.workspaceRoot, signal: abortSignal(), allAssets: opened.flags.allAssets }));
|
|
721
|
+
warnings.push(...transferWarnings.map((w) => warning(w.code, w.message)));
|
|
720
722
|
return {
|
|
721
723
|
state: "completed",
|
|
722
724
|
files: files.map((f) => ({ key: f.key, path: f.path, status: f.status, bytes: f.bytes, sha256: f.sha256, error: f.error })),
|
|
723
725
|
metadata_path: metadataPath,
|
|
724
726
|
material_links: materialLinks,
|
|
727
|
+
skipped,
|
|
725
728
|
};
|
|
726
729
|
}
|
|
727
730
|
catch (err) {
|