@weclapp/sdk 2.0.0-dev.22 → 2.0.0-dev.24

package/dist/cli.js

@@ -1,17 +1,18 @@
 import { fileURLToPath } from 'url';
 import { resolve, dirname } from 'path';
-import { rmdir, stat, readFile, writeFile, rm, cp, mkdir } from 'fs/promises';
 import { rollup } from 'rollup';
 import terser from '@rollup/plugin-terser';
-import ts from 'rollup-plugin-ts';
+import ts from '@rollup/plugin-typescript';
 import indentString from 'indent-string';
 import { snakeCase, pascalCase, camelCase } from 'change-case';
 import chalk from 'chalk';
 import { OpenAPIV3 } from 'openapi-types';
 import { createHash } from 'crypto';
+import { stat, readFile, rm, cp, writeFile, mkdir } from 'fs/promises';
 import { config } from 'dotenv';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
+import pkg from '../package.json' with { type: 'json' };
 import prettyMs from 'pretty-ms';
 
 var Target;
@@ -39,7 +40,7 @@ const currentDirname = () => {
     return fileURLToPath(new URL('..', import.meta.url));
 };
 
-const tsconfig = resolve(currentDirname(), './tsconfig.lib.json');
+const tsconfig = resolve(currentDirname(), './tsconfig.sdk.json');
 const resolveGlobals = (...globals) => Object.fromEntries(globals.map(v => [v, '*']));
 const generateOutput = (config) => ({
     sourcemap: true,
@@ -61,35 +62,22 @@ const bundle = async (workingDirectory, target) => {
             globals: resolveGlobals('node-fetch', 'url')
         })
     ];
-    // Remove build dir
-    await rmdir(dist()).catch(() => void 0);
     const bundles = {
         [Target.BROWSER_PROMISES]: () => ({
-            input: src('browser.ts'),
+            input: src('index.ts'),
+            plugins: [ts({ tsconfig, declarationDir: dist() }), terser()],
             output: [
-                generateOutput({
-                    file: dist('index.cjs'),
-                    name: 'Weclapp',
-                    format: 'umd'
-                }),
                 generateOutput({
                     file: dist('index.js'),
                     format: 'es'
                 })
-            ],
-            plugins: [ts({ tsconfig }), terser()]
+            ]
         }),
         [Target.BROWSER_RX]: () => ({
+            input: src('index.ts'),
+            plugins: [ts({ tsconfig, declarationDir: dist() }), terser()],
             external: ['rxjs'],
-            input: src('browser.rx.ts'),
-            plugins: [ts({ tsconfig }), terser()],
             output: [
-                generateOutput({
-                    file: dist('index.cjs'),
-                    name: 'Weclapp',
-                    format: 'umd',
-                    globals: resolveGlobals('rxjs')
-                }),
                 generateOutput({
                     file: dist('index.js'),
                     format: 'es',
@@ -98,16 +86,16 @@ const bundle = async (workingDirectory, target) => {
             ]
         }),
         [Target.NODE_PROMISES]: () => ({
-            input: src('node.ts'),
-            output: generateNodeOutput(),
+            input: src('index.ts'),
+            plugins: [ts({ tsconfig, declarationDir: dist() }), terser()],
             external: ['node-fetch', 'url'],
-            plugins: [ts({ tsconfig })]
+            output: generateNodeOutput()
         }),
         [Target.NODE_RX]: () => ({
-            input: src('node.rx.ts'),
-            output: generateNodeOutput(),
+            input: src('index.ts'),
+            plugins: [ts({ tsconfig, declarationDir: dist() }), terser()],
             external: ['node-fetch', 'url', 'rxjs'],
-            plugins: [ts({ tsconfig })]
+            output: generateNodeOutput()
         })
     };
     const config = bundles[target]();
@@ -1205,7 +1193,7 @@ const hash = (content, algorithm = 'sha256') => {
 
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 const cli = async () => {
-    const { default: { version } } = await import('../package.json', { assert: { type: 'json' } });
+    const version = pkg.version;
     const { argv } = yargs(hideBin(process.argv))
         .scriptName('build-weclapp-sdk')
         .usage('Usage: $0 <source> [flags]')
@@ -1274,7 +1262,7 @@ const cli = async () => {
         return Promise.reject();
     }
     if (await stat(src).catch(() => false)) {
-        logger.infoLn(`Source is a file.`);
+        logger.infoLn(`Source is a file`);
         const content = JSON.parse(await readFile(src, 'utf-8'));
         return { cache, content, options };
     }
@@ -1300,42 +1288,46 @@ const cli = async () => {
     return { cache, content, options };
 };
 
-const workingDirectory = resolve(currentDirname(), './sdk');
-const folders = ['docs', 'main', 'node', 'raw', 'rx', 'utils'];
+const workingDir = resolve(currentDirname(), './sdk');
+const cacheDir = resolve(currentDirname(), './.cache');
 void (async () => {
     const start = process.hrtime.bigint();
-    const { default: { version } } = await import('../package.json', { assert: { type: 'json' } });
     const { content: doc, cache: useCache, options } = await cli();
-    // Resolve cache dir and key
-    const cacheKey = hash([version, JSON.stringify(doc), JSON.stringify(options)]).slice(-8);
-    const cacheDir = resolve(currentDirname(), '.tmp', cacheKey);
-    const dist = (...paths) => resolve(workingDirectory, ...paths);
-    const tmp = async (...paths) => {
-        const fullPath = resolve(cacheDir, ...paths);
-        await mkdir(dirname(fullPath), { recursive: true }).catch(() => null);
+    const workingDirPath = async (...paths) => {
+        const fullPath = resolve(workingDir, ...paths);
+        await mkdir(dirname(fullPath), { recursive: true });
         return fullPath;
     };
+    // Resolve cache dir and key
+    const cacheKey = hash([pkg.version, JSON.stringify(doc), JSON.stringify(options)]).slice(-8);
+    const cachedSdkDir = resolve(cacheDir, cacheKey);
+    // Remove old SDK
+    await rm(workingDir, { recursive: true, force: true });
     if (useCache) {
         logger.infoLn(`Cache ID: ${cacheKey}`);
     }
-    if (useCache && await stat(cacheDir).catch(() => false)) {
-        logger.successLn(`Cache match! (${cacheDir})`);
+    if (useCache && await stat(cachedSdkDir).catch(() => false)) {
+        // Copy cached SDK to working dir
+        logger.successLn(`Cache match! (${cachedSdkDir})`);
+        await cp(cachedSdkDir, workingDir, { recursive: true });
     }
     else {
-        // Store swagger.json file
-        await writeFile(await tmp('openapi.json'), JSON.stringify(doc, null, 2));
+        // Write swagger.json file
+        await writeFile(await workingDirPath('openapi.json'), JSON.stringify(doc, null, 2));
         logger.infoLn(`Generate sdk (target: ${options.target})`);
-        // Generate SDKs
+        // Generate and write SDK
         const sdk = generate(doc, options);
-        await writeFile(await tmp('src', `${options.target}.ts`), sdk.trim() + '\n');
-        // Bundle
+        await writeFile(await workingDirPath('src', 'index.ts'), sdk.trim() + '\n');
+        // Bundle and write SDK
         logger.infoLn('Bundle... (this may take some time)');
-        await bundle(cacheDir, options.target);
-        // Remove old SDK
-        await Promise.all(folders.map(async (dir) => rm(dist(dir), { recursive: true }).catch(() => 0)));
+        await bundle(workingDir, options.target);
+        if (useCache) {
+            // Copy SDK to cache
+            logger.successLn(`Caching SDK: (${cachedSdkDir})`);
+            await mkdir(cachedSdkDir, { recursive: true });
+            await cp(workingDir, cachedSdkDir, { recursive: true });
+        }
     }
-    // Copy bundled SDK
-    await cp(cacheDir, workingDirectory, { recursive: true });
     // Print job summary
     const duration = (process.hrtime.bigint() - start) / 1000000n;
     logger.successLn(`SDK built in ${prettyMs(Number(duration))}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weclapp/sdk",
-  "version": "2.0.0-dev.22",
+  "version": "2.0.0-dev.24",
   "description": "SDK generator based on a weclapp api swagger file",
   "author": "weclapp",
   "sideEffects": false,
@@ -18,7 +18,7 @@
   "files": [
     "bin",
     "dist",
-    "tsconfig.lib.json"
+    "tsconfig.sdk.json"
   ],
   "engines": {
     "node": ">=20",
@@ -36,37 +36,43 @@
     }
   },
   "scripts": {
-    "cli:build": "cross-env NODE_ENV=production rollup -c rollup.config.js",
-    "cli:watch": "cross-env NODE_ENV=development rollup -c rollup.config.js --watch",
-    "sdk:build": "./bin/cli.js test/openapi.json --target browser",
+    "build": "rollup --config rollup.config.ts --configPlugin typescript={tsconfig:\\'tsconfig.node.json\\'} --configImportAttributesKey with",
+    "build:watch": "npm run build -- --watch",
+    "cli:browser": "./bin/cli.js test/openapi.json --target browser",
+    "cli:browser:cache": "./bin/cli.js test/openapi.json --target browser --cache",
+    "cli:browser.rx": "./bin/cli.js test/openapi.json --target browser.rx",
+    "cli:browser.rx:cache": "./bin/cli.js test/openapi.json --target browser.rx --cache",
+    "cli:node": "./bin/cli.js test/openapi.json --target node",
+    "cli:node:cache": "./bin/cli.js test/openapi.json --target node  --cache",
+    "cli:node.rx": "./bin/cli.js test/openapi.json --target node.rx",
+    "cli:node.rx:cache": "./bin/cli.js test/openapi.json --target node.rx  --cache",
     "lint": "eslint src/**/*.ts",
     "lint:fix": "npm run lint -- --fix",
-    "ci:test": "npm run lint:fix && npm run cli:build && npm run sdk:build",
+    "ci": "npm run lint && npm run build && npm run cli:browser",
     "release": "standard-version"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^6.2.1",
-    "@typescript-eslint/parser": "^6.2.1",
+    "@rollup/pluginutils": "5.1.4",
+    "@typescript-eslint/eslint-plugin": "8.25.0",
+    "@typescript-eslint/parser": "8.25.0",
     "eslint": "^8.46.0",
     "rollup-plugin-string": "^3.0.0",
     "standard-version": "^9.5.0"
   },
   "dependencies": {
-    "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-terser": "^0.4.3",
-    "@types/fs-extra": "^11.0.1",
-    "@types/yargs": "^17.0.24",
-    "chalk": "^5.3.0",
-    "change-case": "^4.1.2",
-    "cross-env": "^7.0.3",
-    "dotenv": "^16.3.1",
-    "indent-string": "^5.0.0",
-    "openapi-types": "^12.1.3",
-    "pretty-ms": "^8.0.0",
-    "rollup": "^3.27.2",
-    "rollup-plugin-ts": "^3.4.3",
-    "typescript": "^5.1.6",
-    "yargs": "^17.7.2"
+    "@rollup/plugin-terser": "0.4.4",
+    "@rollup/plugin-typescript": "12.1.2",
+    "@types/fs-extra": "11.0.1",
+    "@types/yargs": "17.0.33",
+    "chalk": "5.3.0",
+    "change-case": "4.1.2",
+    "dotenv": "16.3.1",
+    "indent-string": "5.0.0",
+    "openapi-types": "12.1.3",
+    "pretty-ms": "8.0.0",
+    "rollup": "4.34.8",
+    "typescript": "5.7.3",
+    "yargs": "17.7.2"
   },
   "peerDependencies": {
     "rxjs": "^7.8.0"

package/{tsconfig.lib.json → tsconfig.sdk.json}

@@ -1,17 +1,16 @@
 {
     "compilerOptions": {
+        "baseUrl": ".",
         "declaration": true,
-        "strict": true,
-        "noImplicitAny": true,
         "esModuleInterop": true,
+        "module": "ESNext",
         "moduleResolution": "node",
-        "module": "commonjs",
-        "target": "ES2020",
-        "sourceMap": false,
-        "allowSyntheticDefaultImports": true,
-        "baseUrl": "."
+        "noImplicitAny": true,
+        "sourceMap": true,
+        "strict": true,
+        "target": "ES2022"
     },
     "include": [
-        ".tmp/**/*.ts"
+        "sdk/**/*.ts"
     ]
 }