@ray-js/builder-component 0.5.4 → 0.5.6-beta-1

package/lib/build.d.ts

@@ -2,6 +2,7 @@ import { CliOptions } from '@ray-js/types';
 declare type Options = Pick<CliOptions, 'source' | 'output' | 'watch'> & {
     cwd: string;
     transformMode: 'pure' | 'auto';
+    emitDeclarationDev: boolean;
 };
 export default function build(options: Options): Promise<void>;
 export {};

package/lib/build.js

@@ -22,14 +22,32 @@ colors_1.default.enable();
 const LOG_PREFIX = 'builder-component';
 function build(options) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { cwd = process.cwd(), source = 'src', output = 'lib', watch = false, transformMode = 'auto', } = options;
+        const { cwd = process.cwd(), source = 'src', output = 'lib', watch = false, transformMode = 'auto', emitDeclarationDev = false, } = options;
         const sourceDir = path_1.default.join(cwd, source);
         const outputDir = path_1.default.join(cwd, output);
+        const emitDTS = (0, transform_1.generateDTS)((file, content) => {
+            const fileBase = path_1.default.relative(sourceDir, file);
+            const dtsFilePath = path_1.default.join(outputDir, fileBase);
+            (0, shared_1.writeFileSync)(dtsFilePath, content);
+            shared_1.log.verbose(LOG_PREFIX, fileBase.gray);
+        });
+        function genDTS(files) {
+            const dtsStartTime = Date.now();
+            shared_1.log.info(LOG_PREFIX, 'd.ts generating...'.yellow);
+            emitDTS(files);
+            shared_1.log.info(LOG_PREFIX, 'd.ts done.'.green, Date.now() - dtsStartTime, 'ms');
+        }
+        const files = globby_1.default.sync(['**/*.*', '!**/demos/**/*.*', '!**/__tests__/**/*.*'], {
+            dot: false,
+            cwd: sourceDir,
+            absolute: true,
+        });
         if (watch) {
             shared_1.log.info(LOG_PREFIX, 'watching...');
             const watcher = chokidar_1.default.watch(['**/*.*', '!**/demos/**/*.*', '!**/__tests__/**/*.*', '!**/*.md'], {
                 cwd: sourceDir,
             });
+            const filesWaitForGenDTS = [...files];
             watcher.on('all', (event, filePath, _) => __awaiter(this, void 0, void 0, function* () {
                 const file = path_1.default.join(sourceDir, filePath);
                 if (event === 'change' || event === 'add') {
@@ -42,6 +60,15 @@ function build(options) {
                     }).catch((error) => {
                         console.error(error);
                     });
+                    if (emitDeclarationDev) {
+                        const index = filesWaitForGenDTS.indexOf(file);
+                        if (index === -1) {
+                            genDTS([file]);
+                        }
+                        else {
+                            filesWaitForGenDTS.splice(index, 1);
+                        }
+                    }
                 }
                 else {
                     shared_1.log.warn(`[${event}]`, filePath);
@@ -54,13 +81,11 @@ function build(options) {
                     }
                 }
             }));
+            if (emitDeclarationDev) {
+                genDTS(files);
+            }
         }
         else {
-            const files = globby_1.default.sync(['**/*.*', '!**/demos/**/*.*', '!**/__tests__/**/*.*'], {
-                dot: false,
-                cwd: sourceDir,
-                absolute: true,
-            });
             if (!files || files.length === 0) {
                 shared_1.log.error(LOG_PREFIX, 'Not exist any files'.red, cwd);
                 process.exit(0);
@@ -76,17 +101,7 @@ function build(options) {
                     console.error(error);
                 });
             }
-            const dtsStartTime = Date.now();
-            shared_1.log.info(LOG_PREFIX, 'd.ts generating...'.yellow);
-            const typeFiles = yield (0, transform_1.generateDTS)(files.filter((file) => /\.tsx?$/.test(file)));
-            for (let index = 0; index < Object.entries(typeFiles).length; index++) {
-                const [dtsFile, content] = Object.entries(typeFiles)[index];
-                const fileBase = path_1.default.relative(sourceDir, dtsFile);
-                const dtsFilePath = path_1.default.join(outputDir, fileBase);
-                (0, shared_1.writeFileSync)(dtsFilePath, content);
-                shared_1.log.verbose(LOG_PREFIX, fileBase.gray);
-            }
-            shared_1.log.info(LOG_PREFIX, 'd.ts done.'.green, Date.now() - dtsStartTime, 'ms');
+            genDTS(files);
         }
     });
 }

package/lib/transform/babelTransform.js

@@ -25,8 +25,6 @@ function babelTransform(file, options) {
         let code = source;
         if (options.target) {
             const { target } = options;
-            process.env.PLATFORM = target;
-            process.env.REMAX_PLATFORM = target;
             babelPlugin = [
                 [
                     require.resolve('../babel/import-replacement'),

package/lib/transform/index.js

@@ -59,6 +59,7 @@ function unlinkPlatformFiles(options) {
     const libFile = path_1.default.join(outputDir, fileBase);
     if (['.ts', '.tsx', '.js', '.jsx'].includes(fileExt) && fileExt !== '.d.ts') {
         likePaths.push(replaceExt(libFile, '.js'));
+        likePaths.push(replaceExt(libFile, '.d.ts'));
         transformTarget.forEach((target) => {
             likePaths.push(replaceExt(libFile, `.${target}.js`));
         });
@@ -69,7 +70,7 @@ function unlinkPlatformFiles(options) {
     likePaths.filter(fs_extra_1.default.existsSync).map(fs_extra_1.default.unlinkSync);
 }
 exports.unlinkPlatformFiles = unlinkPlatformFiles;
-const PLATFORM_EXTENSION = [...Object.keys(types_1.PlatformTarget), 'mini', 'native'];
+const PLATFORM_EXTENSION = [...Object.keys(types_1.PlatformTarget), 'mini'];
 // 平台文件后缀
 // .mini.js 是 ray 定义的小程序文件后缀
 const REGEXP_PLATFORM_EXTENSION = new RegExp(`\\.(?<target>(${PLATFORM_EXTENSION.join('|')}))\\.(ts|js)x?$`);

package/lib/transform/type.d.ts

@@ -1,3 +1 @@
-export declare function generateDTS(files: string[]): Promise<{
-    [path: string]: string;
-}>;
+export declare function generateDTS(cb: (f: string, c: string) => void): (files: string[]) => void;

package/lib/transform/type.js

@@ -22,40 +22,29 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateDTS = void 0;
 const ts = __importStar(require("typescript"));
-function generateDTS(files) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const createdFiles = {};
-        const options = {
-            allowJs: false,
-            declaration: true,
-            emitDeclarationOnly: true,
-            esModuleInterop: true,
-            target: ts.ScriptTarget.ES5,
-            noUnusedParameters: true,
-            noUnusedLocals: true,
-            strictNullChecks: true,
-            jsx: ts.JsxEmit.Preserve,
-            allowSyntheticDefaultImports: true,
-        };
-        const host = ts.createCompilerHost(options);
-        host.writeFile = (fileName, contents) => {
-            createdFiles[fileName] = contents;
-        };
+const options = {
+    allowJs: false,
+    declaration: true,
+    emitDeclarationOnly: true,
+    esModuleInterop: true,
+    target: ts.ScriptTarget.ES5,
+    noUnusedParameters: true,
+    noUnusedLocals: true,
+    strictNullChecks: true,
+    jsx: ts.JsxEmit.Preserve,
+    allowSyntheticDefaultImports: true,
+};
+function generateDTS(cb) {
+    const host = ts.createCompilerHost(options);
+    host.writeFile = (fileName, contents) => {
+        cb(fileName, contents);
+    };
+    return (files) => {
         const program = ts.createProgram(files, options, host);
         program.emit();
-        return createdFiles;
-    });
+    };
 }
 exports.generateDTS = generateDTS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/builder-component",
-  "version": "0.5.4",
+  "version": "0.5.6-beta-1",
   "description": "Ray builder for component",
   "keywords": [
     "ray"
@@ -24,10 +24,10 @@
     "@babel/helper-plugin-utils": "^7.14.5",
     "@babel/traverse": "^7.16.3",
     "@babel/types": "^7.16.0",
-    "@ray-js/babel-preset-standard": "^0.5.4",
-    "@ray-js/env-loader": "^0.5.4",
-    "@ray-js/shared": "^0.5.4",
-    "@ray-js/types": "^0.5.4",
+    "@ray-js/babel-preset-standard": "^0.5.6-beta-1",
+    "@ray-js/env-loader": "^0.5.6-beta-1",
+    "@ray-js/shared": "^0.5.6-beta-1",
+    "@ray-js/types": "^0.5.6-beta-1",
     "babel-plugin-import": "^1.13.3",
     "chokidar": "^3.5.2",
     "colors": "1.4.0",
@@ -44,6 +44,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "5d19e7617b6ded78fb6426ada87307e2b1d4bae5",
+  "gitHead": "46f291d3c38bb9fa1af739d01f9513c39e3b6be9",
   "repository": {}
 }