From a19de93f0e96ed47668965b687e2e6958cfee988 Mon Sep 17 00:00:00 2001 From: Code Date: Mon, 17 Feb 2025 18:21:08 +0100 Subject: [PATCH] cad | ts config base --- packages/cad/dist/cad/sw-convert.js | 6 +++--- packages/cad/src/cad/sw-convert.ts | 4 ++-- packages/cad/src/commands/sw.ts | 25 +++++-------------------- packages/typescript-config/base.json | 2 +- 4 files changed, 11 insertions(+), 26 deletions(-) diff --git a/packages/cad/dist/cad/sw-convert.js b/packages/cad/dist/cad/sw-convert.js index 244a7256..369ad5ee 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 { equalFiles, swProcMessage } from './sw-util.js'; +import { dirname, 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:' + import.meta.dirname); + logger.error('__dirname:' + 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":"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"} \ 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/src/cad/sw-convert.ts b/packages/cad/src/cad/sw-convert.ts index 1c2b7618..da1777f3 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 { equalFiles, swProcMessage } from './sw-util.js' +import { dirname,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:' + import.meta.dirname) + logger.error('__dirname:' + dirname()) logger.error('options.sw ' + options.sw) return } diff --git a/packages/cad/src/commands/sw.ts b/packages/cad/src/commands/sw.ts index e900ff96..bc782404 100644 --- a/packages/cad/src/commands/sw.ts +++ b/packages/cad/src/commands/sw.ts @@ -3,26 +3,11 @@ import { logger } from '../index.js' import { SolidworkOptions } from '../types.js' import { defaultOptions, sanitize } from '../sw_argv.js' import { convert } from '../cad/sw-convert.js' - export const options = (yargs: CLI.Argv) => defaultOptions(yargs) - -/* -export const register = (cli: CLI.Argv) => { - return cli.command('sw', 'Convert CAD files via Solidworks Interop API', options, async (argv: CLI.Arguments) => { - if (argv.help) { return } - const options = sanitize(argv) as SolidworkOptions - logger.setSettings({ minLevel: options.logLevel as any }) - logger.info("options " + argv.dst, options) - return convert(options) as any - }) -} -*/ -export const builder = options - export const handler = (argv) => { if (argv.help) { return } - const options = sanitize(argv) as SolidworkOptions - logger.setSettings({ minLevel: options.logLevel as any }) - logger.info("options " + argv.dst, options) - return convert(options) as any -}; \ No newline at end of file + const options = sanitize(argv) as SolidworkOptions + logger.setSettings({ minLevel: options.logLevel as any }) + logger.info("options " + argv.dst, options) + return convert(options) as any +} \ No newline at end of file diff --git a/packages/typescript-config/base.json b/packages/typescript-config/base.json index 7ba37902..2319d2be 100644 --- a/packages/typescript-config/base.json +++ b/packages/typescript-config/base.json @@ -4,7 +4,7 @@ "declaration": true, "strict": false, "moduleResolution": "nodenext", - "target": "es2022", + "target": "ESNext", "module": "NodeNext", "esModuleInterop": true, "skipLibCheck": true,