diff --git a/packages/osr-cad/src/sw_argv.ts b/packages/osr-cad/src/sw_argv.ts index e38d1e2..55f000a 100644 --- a/packages/osr-cad/src/sw_argv.ts +++ b/packages/osr-cad/src/sw_argv.ts @@ -140,8 +140,8 @@ export const sanitizeSingle = (argv: CLI.Arguments): SolidworkOptions => { hidden: argv.hidden || "true", configuration: argv.configuration || 'Default', script: argv.script || 'convert.exe', - sw: argv.sw || 2024, - swv: argv.swv || 32, + sw: argv.sw || 2025, + swv: argv.swv || 33, view: argv.view || '*Render', pack: argv.pack, light: argv.light, @@ -212,8 +212,8 @@ export const sanitize = (argv: any): SolidworkOptions => { width: argv.width || "1024", height: argv.height || "1024", script: argv.script || 'convert.exe', - sw: argv.sw || 2024, - swv: argv.swv || 32, + sw: argv.sw || 2025, + swv: argv.swv || 33, configuration: argv.configuration || 'Default', report: argv.report || DEFAULT_REPORT, pack: argv.pack, diff --git a/packages/osr-cad/sw_argv.js b/packages/osr-cad/sw_argv.js index 6d58c5e..fddc1d6 100644 --- a/packages/osr-cad/sw_argv.js +++ b/packages/osr-cad/sw_argv.js @@ -138,8 +138,8 @@ const sanitizeSingle = (argv) => { hidden: argv.hidden || "true", configuration: argv.configuration || 'Default', script: argv.script || 'convert.exe', - sw: argv.sw || 2024, - swv: argv.swv || 32, + sw: argv.sw || 2025, + swv: argv.swv || 33, view: argv.view || '*Render', pack: argv.pack, light: argv.light, @@ -206,8 +206,8 @@ const sanitize = (argv) => { width: argv.width || "1024", height: argv.height || "1024", script: argv.script || 'convert.exe', - sw: argv.sw || 2024, - swv: argv.swv || 32, + sw: argv.sw || 2025, + swv: argv.swv || 33, configuration: argv.configuration || 'Default', report: argv.report || constants_1.DEFAULT_REPORT, pack: argv.pack, diff --git a/packages/osr-tasks/src/zod_schema.d.ts b/packages/osr-tasks/src/zod_schema.d.ts index a6fcccf..ff9b7db 100644 --- a/packages/osr-tasks/src/zod_schema.d.ts +++ b/packages/osr-tasks/src/zod_schema.d.ts @@ -94,7 +94,7 @@ export declare const compilerOptions: () => z.ZodObject<{ export declare const taskOptions: () => z.ZodObject<{ logLevel: z.ZodDefault>; sourceLanguage: z.ZodDefault; - languages: z.ZodDefault, "many">, z.ZodEffects]>>; + languages: z.ZodDefault, "many">, z.ZodEffects]>>; src: z.ZodDefault>; taskPrefix: z.ZodDefault; taskSuffix: z.ZodDefault; @@ -109,7 +109,7 @@ export declare const taskOptions: () => z.ZodObject<{ }, "passthrough", z.ZodTypeAny, z.objectOutputType<{ logLevel: z.ZodDefault>; sourceLanguage: z.ZodDefault; - languages: z.ZodDefault, "many">, z.ZodEffects]>>; + languages: z.ZodDefault, "many">, z.ZodEffects]>>; src: z.ZodDefault>; taskPrefix: z.ZodDefault; taskSuffix: z.ZodDefault; @@ -124,7 +124,7 @@ export declare const taskOptions: () => z.ZodObject<{ }, z.ZodTypeAny, "passthrough">, z.objectInputType<{ logLevel: z.ZodDefault>; sourceLanguage: z.ZodDefault; - languages: z.ZodDefault, "many">, z.ZodEffects]>>; + languages: z.ZodDefault, "many">, z.ZodEffects]>>; src: z.ZodDefault>; taskPrefix: z.ZodDefault; taskSuffix: z.ZodDefault; @@ -218,7 +218,7 @@ export declare const schemas: () => (z.ZodObject<{ }, z.ZodTypeAny, "passthrough">> | z.ZodObject<{ logLevel: z.ZodDefault>; sourceLanguage: z.ZodDefault; - languages: z.ZodDefault, "many">, z.ZodEffects]>>; + languages: z.ZodDefault, "many">, z.ZodEffects]>>; src: z.ZodDefault>; taskPrefix: z.ZodDefault; taskSuffix: z.ZodDefault; @@ -233,7 +233,7 @@ export declare const schemas: () => (z.ZodObject<{ }, "passthrough", z.ZodTypeAny, z.objectOutputType<{ logLevel: z.ZodDefault>; sourceLanguage: z.ZodDefault; - languages: z.ZodDefault, "many">, z.ZodEffects]>>; + languages: z.ZodDefault, "many">, z.ZodEffects]>>; src: z.ZodDefault>; taskPrefix: z.ZodDefault; taskSuffix: z.ZodDefault; @@ -248,7 +248,7 @@ export declare const schemas: () => (z.ZodObject<{ }, z.ZodTypeAny, "passthrough">, z.objectInputType<{ logLevel: z.ZodDefault>; sourceLanguage: z.ZodDefault; - languages: z.ZodDefault, "many">, z.ZodEffects]>>; + languages: z.ZodDefault, "many">, z.ZodEffects]>>; src: z.ZodDefault>; taskPrefix: z.ZodDefault; taskSuffix: z.ZodDefault; diff --git a/packages/osr-tasks/tasks/laser2.js b/packages/osr-tasks/tasks/laser2.js index 8bc011c..4782c02 100644 --- a/packages/osr-tasks/tasks/laser2.js +++ b/packages/osr-tasks/tasks/laser2.js @@ -146,6 +146,9 @@ const createLaserFiles = async (root, product, options, grunt) => { if (!Components) { return qty; } + if (filePath.includes('7_Side_x2_6mm_FERRO')) { + debugger; + } let count = 1; const chlidren = tree.root.Children; if (chlidren) { diff --git a/packages/osr-tasks/tasks/utils.d.ts b/packages/osr-tasks/tasks/utils.d.ts index 5089ce4..40b32a4 100644 --- a/packages/osr-tasks/tasks/utils.d.ts +++ b/packages/osr-tasks/tasks/utils.d.ts @@ -13,23 +13,23 @@ export declare const mailOptionSchema: z.ZodObject<{ logLevel: z.ZodDefault; }, "strip", z.ZodTypeAny, { filter?: boolean; + transport?: string; query?: string; subject?: string; from?: string; logLevel?: string; dry?: boolean; - transport?: string; contacts?: string; to?: string; send?: boolean; }, { filter?: boolean; + transport?: string; query?: string; subject?: string; from?: string; logLevel?: string; dry?: boolean; - transport?: string; contacts?: string; to?: string; send?: boolean; @@ -89,17 +89,17 @@ export declare const mailCompileSchema: (grunt: any) => z.ZodObject<{ }>; }, "strip", z.ZodTypeAny, { source?: string; + module?: string; + output?: string; + template?: string; + language?: string; cwd?: string; env?: string; format?: string; - module?: string; - output?: string; sourceLanguage?: string; targetLanguage?: string; logLevel?: string; root?: string; - language?: string; - template?: string; profile?: string; cache?: boolean; variables?: { @@ -111,17 +111,17 @@ export declare const mailCompileSchema: (grunt: any) => z.ZodObject<{ }; }, { source?: string; + module?: string; + output?: string; + template?: string; + language?: string; cwd?: string; env?: string; format?: string; - module?: string; - output?: string; sourceLanguage?: string; targetLanguage?: string; logLevel?: string; root?: string; - language?: string; - template?: string; profile?: string; cache?: boolean; variables?: { diff --git a/packages/osrl/package-lock.json b/packages/osrl/package-lock.json index 8dbf96a..fd60eff 100644 --- a/packages/osrl/package-lock.json +++ b/packages/osrl/package-lock.json @@ -532,6 +532,7 @@ "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.26.0", @@ -5846,6 +5847,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "caniuse-lite": "^1.0.30001669", "electron-to-chromium": "^1.5.41", @@ -10569,6 +10571,7 @@ "resolved": "https://registry.npmjs.org/jsep/-/jsep-1.3.9.tgz", "integrity": "sha512-i1rBX5N7VPl0eYb6+mHNp52sEuaS2Wi8CDYx1X5sn9naevL78+265XJqy1qENEk7mRKwS06NHpUqiBwR7qeodw==", "license": "MIT", + "peer": true, "engines": { "node": ">= 10.16.0" } @@ -14506,6 +14509,7 @@ "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", "dev": true, "license": "Apache-2.0", + "peer": true, "dependencies": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -17766,6 +17770,7 @@ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz", "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==", "dev": true, + "peer": true, "requires": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.26.0", @@ -21312,6 +21317,7 @@ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz", "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==", "dev": true, + "peer": true, "requires": { "caniuse-lite": "^1.0.30001669", "electron-to-chromium": "^1.5.41", @@ -24772,7 +24778,8 @@ "jsep": { "version": "1.3.9", "resolved": "https://registry.npmjs.org/jsep/-/jsep-1.3.9.tgz", - "integrity": "sha512-i1rBX5N7VPl0eYb6+mHNp52sEuaS2Wi8CDYx1X5sn9naevL78+265XJqy1qENEk7mRKwS06NHpUqiBwR7qeodw==" + "integrity": "sha512-i1rBX5N7VPl0eYb6+mHNp52sEuaS2Wi8CDYx1X5sn9naevL78+265XJqy1qENEk7mRKwS06NHpUqiBwR7qeodw==", + "peer": true }, "jsesc": { "version": "3.0.2", @@ -27837,6 +27844,7 @@ "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", "dev": true, + "peer": true, "requires": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0",