This commit is contained in:
babayaga 2026-01-27 11:59:13 +01:00
parent 852c1713f8
commit abe885722b
6 changed files with 36 additions and 25 deletions

View File

@ -140,8 +140,8 @@ export const sanitizeSingle = (argv: CLI.Arguments): SolidworkOptions => {
hidden: argv.hidden || "true", hidden: argv.hidden || "true",
configuration: argv.configuration || 'Default', configuration: argv.configuration || 'Default',
script: argv.script || 'convert.exe', script: argv.script || 'convert.exe',
sw: argv.sw || 2024, sw: argv.sw || 2025,
swv: argv.swv || 32, swv: argv.swv || 33,
view: argv.view || '*Render', view: argv.view || '*Render',
pack: argv.pack, pack: argv.pack,
light: argv.light, light: argv.light,
@ -212,8 +212,8 @@ export const sanitize = (argv: any): SolidworkOptions => {
width: argv.width || "1024", width: argv.width || "1024",
height: argv.height || "1024", height: argv.height || "1024",
script: argv.script || 'convert.exe', script: argv.script || 'convert.exe',
sw: argv.sw || 2024, sw: argv.sw || 2025,
swv: argv.swv || 32, swv: argv.swv || 33,
configuration: argv.configuration || 'Default', configuration: argv.configuration || 'Default',
report: argv.report || DEFAULT_REPORT, report: argv.report || DEFAULT_REPORT,
pack: argv.pack, pack: argv.pack,

View File

@ -138,8 +138,8 @@ const sanitizeSingle = (argv) => {
hidden: argv.hidden || "true", hidden: argv.hidden || "true",
configuration: argv.configuration || 'Default', configuration: argv.configuration || 'Default',
script: argv.script || 'convert.exe', script: argv.script || 'convert.exe',
sw: argv.sw || 2024, sw: argv.sw || 2025,
swv: argv.swv || 32, swv: argv.swv || 33,
view: argv.view || '*Render', view: argv.view || '*Render',
pack: argv.pack, pack: argv.pack,
light: argv.light, light: argv.light,
@ -206,8 +206,8 @@ const sanitize = (argv) => {
width: argv.width || "1024", width: argv.width || "1024",
height: argv.height || "1024", height: argv.height || "1024",
script: argv.script || 'convert.exe', script: argv.script || 'convert.exe',
sw: argv.sw || 2024, sw: argv.sw || 2025,
swv: argv.swv || 32, swv: argv.swv || 33,
configuration: argv.configuration || 'Default', configuration: argv.configuration || 'Default',
report: argv.report || constants_1.DEFAULT_REPORT, report: argv.report || constants_1.DEFAULT_REPORT,
pack: argv.pack, pack: argv.pack,

View File

@ -94,7 +94,7 @@ export declare const compilerOptions: () => z.ZodObject<{
export declare const taskOptions: () => z.ZodObject<{ export declare const taskOptions: () => z.ZodObject<{
logLevel: z.ZodDefault<z.ZodEnum<["silly", "trace", "debug", "info", "warn", "error", "fatal"]>>; logLevel: z.ZodDefault<z.ZodEnum<["silly", "trace", "debug", "info", "warn", "error", "fatal"]>>;
sourceLanguage: z.ZodDefault<z.ZodString>; sourceLanguage: z.ZodDefault<z.ZodString>;
languages: z.ZodDefault<z.ZodUnion<[z.ZodArray<z.ZodDefault<z.ZodString>, "many">, z.ZodEffects<z.ZodString, ("en" | "pt" | "bg" | "cs" | "da" | "de" | "el" | "es" | "et" | "fi" | "fr" | "hu" | "id" | "it" | "ja" | "ko" | "lt" | "lv" | "nb" | "nl" | "pl" | "ro" | "ru" | "sk" | "sl" | "sv" | "tr" | "uk" | "zh")[], string>]>>; languages: z.ZodDefault<z.ZodUnion<[z.ZodArray<z.ZodDefault<z.ZodString>, "many">, z.ZodEffects<z.ZodString, ("id" | "tr" | "en" | "pt" | "bg" | "cs" | "da" | "de" | "el" | "es" | "et" | "fi" | "fr" | "hu" | "it" | "ja" | "ko" | "lt" | "lv" | "nb" | "nl" | "pl" | "ro" | "ru" | "sk" | "sl" | "sv" | "uk" | "zh")[], string>]>>;
src: z.ZodDefault<z.ZodArray<z.ZodString, "many">>; src: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
taskPrefix: z.ZodDefault<z.ZodString>; taskPrefix: z.ZodDefault<z.ZodString>;
taskSuffix: z.ZodDefault<z.ZodString>; taskSuffix: z.ZodDefault<z.ZodString>;
@ -109,7 +109,7 @@ export declare const taskOptions: () => z.ZodObject<{
}, "passthrough", z.ZodTypeAny, z.objectOutputType<{ }, "passthrough", z.ZodTypeAny, z.objectOutputType<{
logLevel: z.ZodDefault<z.ZodEnum<["silly", "trace", "debug", "info", "warn", "error", "fatal"]>>; logLevel: z.ZodDefault<z.ZodEnum<["silly", "trace", "debug", "info", "warn", "error", "fatal"]>>;
sourceLanguage: z.ZodDefault<z.ZodString>; sourceLanguage: z.ZodDefault<z.ZodString>;
languages: z.ZodDefault<z.ZodUnion<[z.ZodArray<z.ZodDefault<z.ZodString>, "many">, z.ZodEffects<z.ZodString, ("en" | "pt" | "bg" | "cs" | "da" | "de" | "el" | "es" | "et" | "fi" | "fr" | "hu" | "id" | "it" | "ja" | "ko" | "lt" | "lv" | "nb" | "nl" | "pl" | "ro" | "ru" | "sk" | "sl" | "sv" | "tr" | "uk" | "zh")[], string>]>>; languages: z.ZodDefault<z.ZodUnion<[z.ZodArray<z.ZodDefault<z.ZodString>, "many">, z.ZodEffects<z.ZodString, ("id" | "tr" | "en" | "pt" | "bg" | "cs" | "da" | "de" | "el" | "es" | "et" | "fi" | "fr" | "hu" | "it" | "ja" | "ko" | "lt" | "lv" | "nb" | "nl" | "pl" | "ro" | "ru" | "sk" | "sl" | "sv" | "uk" | "zh")[], string>]>>;
src: z.ZodDefault<z.ZodArray<z.ZodString, "many">>; src: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
taskPrefix: z.ZodDefault<z.ZodString>; taskPrefix: z.ZodDefault<z.ZodString>;
taskSuffix: z.ZodDefault<z.ZodString>; taskSuffix: z.ZodDefault<z.ZodString>;
@ -124,7 +124,7 @@ export declare const taskOptions: () => z.ZodObject<{
}, z.ZodTypeAny, "passthrough">, z.objectInputType<{ }, z.ZodTypeAny, "passthrough">, z.objectInputType<{
logLevel: z.ZodDefault<z.ZodEnum<["silly", "trace", "debug", "info", "warn", "error", "fatal"]>>; logLevel: z.ZodDefault<z.ZodEnum<["silly", "trace", "debug", "info", "warn", "error", "fatal"]>>;
sourceLanguage: z.ZodDefault<z.ZodString>; sourceLanguage: z.ZodDefault<z.ZodString>;
languages: z.ZodDefault<z.ZodUnion<[z.ZodArray<z.ZodDefault<z.ZodString>, "many">, z.ZodEffects<z.ZodString, ("en" | "pt" | "bg" | "cs" | "da" | "de" | "el" | "es" | "et" | "fi" | "fr" | "hu" | "id" | "it" | "ja" | "ko" | "lt" | "lv" | "nb" | "nl" | "pl" | "ro" | "ru" | "sk" | "sl" | "sv" | "tr" | "uk" | "zh")[], string>]>>; languages: z.ZodDefault<z.ZodUnion<[z.ZodArray<z.ZodDefault<z.ZodString>, "many">, z.ZodEffects<z.ZodString, ("id" | "tr" | "en" | "pt" | "bg" | "cs" | "da" | "de" | "el" | "es" | "et" | "fi" | "fr" | "hu" | "it" | "ja" | "ko" | "lt" | "lv" | "nb" | "nl" | "pl" | "ro" | "ru" | "sk" | "sl" | "sv" | "uk" | "zh")[], string>]>>;
src: z.ZodDefault<z.ZodArray<z.ZodString, "many">>; src: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
taskPrefix: z.ZodDefault<z.ZodString>; taskPrefix: z.ZodDefault<z.ZodString>;
taskSuffix: z.ZodDefault<z.ZodString>; taskSuffix: z.ZodDefault<z.ZodString>;
@ -218,7 +218,7 @@ export declare const schemas: () => (z.ZodObject<{
}, z.ZodTypeAny, "passthrough">> | z.ZodObject<{ }, z.ZodTypeAny, "passthrough">> | z.ZodObject<{
logLevel: z.ZodDefault<z.ZodEnum<["silly", "trace", "debug", "info", "warn", "error", "fatal"]>>; logLevel: z.ZodDefault<z.ZodEnum<["silly", "trace", "debug", "info", "warn", "error", "fatal"]>>;
sourceLanguage: z.ZodDefault<z.ZodString>; sourceLanguage: z.ZodDefault<z.ZodString>;
languages: z.ZodDefault<z.ZodUnion<[z.ZodArray<z.ZodDefault<z.ZodString>, "many">, z.ZodEffects<z.ZodString, ("en" | "pt" | "bg" | "cs" | "da" | "de" | "el" | "es" | "et" | "fi" | "fr" | "hu" | "id" | "it" | "ja" | "ko" | "lt" | "lv" | "nb" | "nl" | "pl" | "ro" | "ru" | "sk" | "sl" | "sv" | "tr" | "uk" | "zh")[], string>]>>; languages: z.ZodDefault<z.ZodUnion<[z.ZodArray<z.ZodDefault<z.ZodString>, "many">, z.ZodEffects<z.ZodString, ("id" | "tr" | "en" | "pt" | "bg" | "cs" | "da" | "de" | "el" | "es" | "et" | "fi" | "fr" | "hu" | "it" | "ja" | "ko" | "lt" | "lv" | "nb" | "nl" | "pl" | "ro" | "ru" | "sk" | "sl" | "sv" | "uk" | "zh")[], string>]>>;
src: z.ZodDefault<z.ZodArray<z.ZodString, "many">>; src: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
taskPrefix: z.ZodDefault<z.ZodString>; taskPrefix: z.ZodDefault<z.ZodString>;
taskSuffix: z.ZodDefault<z.ZodString>; taskSuffix: z.ZodDefault<z.ZodString>;
@ -233,7 +233,7 @@ export declare const schemas: () => (z.ZodObject<{
}, "passthrough", z.ZodTypeAny, z.objectOutputType<{ }, "passthrough", z.ZodTypeAny, z.objectOutputType<{
logLevel: z.ZodDefault<z.ZodEnum<["silly", "trace", "debug", "info", "warn", "error", "fatal"]>>; logLevel: z.ZodDefault<z.ZodEnum<["silly", "trace", "debug", "info", "warn", "error", "fatal"]>>;
sourceLanguage: z.ZodDefault<z.ZodString>; sourceLanguage: z.ZodDefault<z.ZodString>;
languages: z.ZodDefault<z.ZodUnion<[z.ZodArray<z.ZodDefault<z.ZodString>, "many">, z.ZodEffects<z.ZodString, ("en" | "pt" | "bg" | "cs" | "da" | "de" | "el" | "es" | "et" | "fi" | "fr" | "hu" | "id" | "it" | "ja" | "ko" | "lt" | "lv" | "nb" | "nl" | "pl" | "ro" | "ru" | "sk" | "sl" | "sv" | "tr" | "uk" | "zh")[], string>]>>; languages: z.ZodDefault<z.ZodUnion<[z.ZodArray<z.ZodDefault<z.ZodString>, "many">, z.ZodEffects<z.ZodString, ("id" | "tr" | "en" | "pt" | "bg" | "cs" | "da" | "de" | "el" | "es" | "et" | "fi" | "fr" | "hu" | "it" | "ja" | "ko" | "lt" | "lv" | "nb" | "nl" | "pl" | "ro" | "ru" | "sk" | "sl" | "sv" | "uk" | "zh")[], string>]>>;
src: z.ZodDefault<z.ZodArray<z.ZodString, "many">>; src: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
taskPrefix: z.ZodDefault<z.ZodString>; taskPrefix: z.ZodDefault<z.ZodString>;
taskSuffix: z.ZodDefault<z.ZodString>; taskSuffix: z.ZodDefault<z.ZodString>;
@ -248,7 +248,7 @@ export declare const schemas: () => (z.ZodObject<{
}, z.ZodTypeAny, "passthrough">, z.objectInputType<{ }, z.ZodTypeAny, "passthrough">, z.objectInputType<{
logLevel: z.ZodDefault<z.ZodEnum<["silly", "trace", "debug", "info", "warn", "error", "fatal"]>>; logLevel: z.ZodDefault<z.ZodEnum<["silly", "trace", "debug", "info", "warn", "error", "fatal"]>>;
sourceLanguage: z.ZodDefault<z.ZodString>; sourceLanguage: z.ZodDefault<z.ZodString>;
languages: z.ZodDefault<z.ZodUnion<[z.ZodArray<z.ZodDefault<z.ZodString>, "many">, z.ZodEffects<z.ZodString, ("en" | "pt" | "bg" | "cs" | "da" | "de" | "el" | "es" | "et" | "fi" | "fr" | "hu" | "id" | "it" | "ja" | "ko" | "lt" | "lv" | "nb" | "nl" | "pl" | "ro" | "ru" | "sk" | "sl" | "sv" | "tr" | "uk" | "zh")[], string>]>>; languages: z.ZodDefault<z.ZodUnion<[z.ZodArray<z.ZodDefault<z.ZodString>, "many">, z.ZodEffects<z.ZodString, ("id" | "tr" | "en" | "pt" | "bg" | "cs" | "da" | "de" | "el" | "es" | "et" | "fi" | "fr" | "hu" | "it" | "ja" | "ko" | "lt" | "lv" | "nb" | "nl" | "pl" | "ro" | "ru" | "sk" | "sl" | "sv" | "uk" | "zh")[], string>]>>;
src: z.ZodDefault<z.ZodArray<z.ZodString, "many">>; src: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
taskPrefix: z.ZodDefault<z.ZodString>; taskPrefix: z.ZodDefault<z.ZodString>;
taskSuffix: z.ZodDefault<z.ZodString>; taskSuffix: z.ZodDefault<z.ZodString>;

View File

@ -146,6 +146,9 @@ const createLaserFiles = async (root, product, options, grunt) => {
if (!Components) { if (!Components) {
return qty; return qty;
} }
if (filePath.includes('7_Side_x2_6mm_FERRO')) {
debugger;
}
let count = 1; let count = 1;
const chlidren = tree.root.Children; const chlidren = tree.root.Children;
if (chlidren) { if (chlidren) {

View File

@ -13,23 +13,23 @@ export declare const mailOptionSchema: z.ZodObject<{
logLevel: z.ZodDefault<z.ZodString>; logLevel: z.ZodDefault<z.ZodString>;
}, "strip", z.ZodTypeAny, { }, "strip", z.ZodTypeAny, {
filter?: boolean; filter?: boolean;
transport?: string;
query?: string; query?: string;
subject?: string; subject?: string;
from?: string; from?: string;
logLevel?: string; logLevel?: string;
dry?: boolean; dry?: boolean;
transport?: string;
contacts?: string; contacts?: string;
to?: string; to?: string;
send?: boolean; send?: boolean;
}, { }, {
filter?: boolean; filter?: boolean;
transport?: string;
query?: string; query?: string;
subject?: string; subject?: string;
from?: string; from?: string;
logLevel?: string; logLevel?: string;
dry?: boolean; dry?: boolean;
transport?: string;
contacts?: string; contacts?: string;
to?: string; to?: string;
send?: boolean; send?: boolean;
@ -89,17 +89,17 @@ export declare const mailCompileSchema: (grunt: any) => z.ZodObject<{
}>; }>;
}, "strip", z.ZodTypeAny, { }, "strip", z.ZodTypeAny, {
source?: string; source?: string;
module?: string;
output?: string;
template?: string;
language?: string;
cwd?: string; cwd?: string;
env?: string; env?: string;
format?: string; format?: string;
module?: string;
output?: string;
sourceLanguage?: string; sourceLanguage?: string;
targetLanguage?: string; targetLanguage?: string;
logLevel?: string; logLevel?: string;
root?: string; root?: string;
language?: string;
template?: string;
profile?: string; profile?: string;
cache?: boolean; cache?: boolean;
variables?: { variables?: {
@ -111,17 +111,17 @@ export declare const mailCompileSchema: (grunt: any) => z.ZodObject<{
}; };
}, { }, {
source?: string; source?: string;
module?: string;
output?: string;
template?: string;
language?: string;
cwd?: string; cwd?: string;
env?: string; env?: string;
format?: string; format?: string;
module?: string;
output?: string;
sourceLanguage?: string; sourceLanguage?: string;
targetLanguage?: string; targetLanguage?: string;
logLevel?: string; logLevel?: string;
root?: string; root?: string;
language?: string;
template?: string;
profile?: string; profile?: string;
cache?: boolean; cache?: boolean;
variables?: { variables?: {

View File

@ -532,6 +532,7 @@
"integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==", "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@ampproject/remapping": "^2.2.0", "@ampproject/remapping": "^2.2.0",
"@babel/code-frame": "^7.26.0", "@babel/code-frame": "^7.26.0",
@ -5846,6 +5847,7 @@
} }
], ],
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"caniuse-lite": "^1.0.30001669", "caniuse-lite": "^1.0.30001669",
"electron-to-chromium": "^1.5.41", "electron-to-chromium": "^1.5.41",
@ -10569,6 +10571,7 @@
"resolved": "https://registry.npmjs.org/jsep/-/jsep-1.3.9.tgz", "resolved": "https://registry.npmjs.org/jsep/-/jsep-1.3.9.tgz",
"integrity": "sha512-i1rBX5N7VPl0eYb6+mHNp52sEuaS2Wi8CDYx1X5sn9naevL78+265XJqy1qENEk7mRKwS06NHpUqiBwR7qeodw==", "integrity": "sha512-i1rBX5N7VPl0eYb6+mHNp52sEuaS2Wi8CDYx1X5sn9naevL78+265XJqy1qENEk7mRKwS06NHpUqiBwR7qeodw==",
"license": "MIT", "license": "MIT",
"peer": true,
"engines": { "engines": {
"node": ">= 10.16.0" "node": ">= 10.16.0"
} }
@ -14506,6 +14509,7 @@
"deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
"dev": true, "dev": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"peer": true,
"dependencies": { "dependencies": {
"aws-sign2": "~0.7.0", "aws-sign2": "~0.7.0",
"aws4": "^1.8.0", "aws4": "^1.8.0",
@ -17766,6 +17770,7 @@
"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz",
"integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==", "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==",
"dev": true, "dev": true,
"peer": true,
"requires": { "requires": {
"@ampproject/remapping": "^2.2.0", "@ampproject/remapping": "^2.2.0",
"@babel/code-frame": "^7.26.0", "@babel/code-frame": "^7.26.0",
@ -21312,6 +21317,7 @@
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
"integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==", "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
"dev": true, "dev": true,
"peer": true,
"requires": { "requires": {
"caniuse-lite": "^1.0.30001669", "caniuse-lite": "^1.0.30001669",
"electron-to-chromium": "^1.5.41", "electron-to-chromium": "^1.5.41",
@ -24772,7 +24778,8 @@
"jsep": { "jsep": {
"version": "1.3.9", "version": "1.3.9",
"resolved": "https://registry.npmjs.org/jsep/-/jsep-1.3.9.tgz", "resolved": "https://registry.npmjs.org/jsep/-/jsep-1.3.9.tgz",
"integrity": "sha512-i1rBX5N7VPl0eYb6+mHNp52sEuaS2Wi8CDYx1X5sn9naevL78+265XJqy1qENEk7mRKwS06NHpUqiBwR7qeodw==" "integrity": "sha512-i1rBX5N7VPl0eYb6+mHNp52sEuaS2Wi8CDYx1X5sn9naevL78+265XJqy1qENEk7mRKwS06NHpUqiBwR7qeodw==",
"peer": true
}, },
"jsesc": { "jsesc": {
"version": "3.0.2", "version": "3.0.2",
@ -27837,6 +27844,7 @@
"resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
"integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
"dev": true, "dev": true,
"peer": true,
"requires": { "requires": {
"aws-sign2": "~0.7.0", "aws-sign2": "~0.7.0",
"aws4": "^1.8.0", "aws4": "^1.8.0",