@dcloudio/uni-cli-shared 3.0.0-alpha-4010820240523001 → 3.0.0-alpha-4010820240529002

package/dist/json/theme.d.ts

@@ -2,3 +2,22 @@ export declare function hasThemeJson(themeLocation: string): boolean;
 export declare const parseThemeJson: (themeLocation?: string) => UniApp.ThemeJson;
 export declare const normalizeThemeConfigOnce: (manifestJsonPlatform?: Record<string, any>) => UniApp.ThemeJson;
 export declare function initTheme<T extends object>(manifestJson: Record<string, any>, pagesJson: T): T;
+export declare class ThemeSassParser {
+    _index: number;
+    _input: string;
+    _theme: Record<string, Record<string, any>>;
+    constructor();
+    parse(input: string): Record<string, Record<string, any>>;
+    parseVariable(): void;
+    parseVariableValue(): any;
+    parseFunction(): void | string[];
+    skipOtherValue(): void;
+    parseString(): string;
+    pushThemeValue(key: string, valuePair: string[]): void;
+    consume(expected: string): void;
+    get currentChar(): string;
+    skipWhiteSpaceAndComments(): void;
+    skipComment(): void;
+    skipWhiteSpace(): void;
+    isspace(str: string): boolean;
+}

package/dist/json/theme.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initTheme = exports.normalizeThemeConfigOnce = exports.parseThemeJson = exports.hasThemeJson = void 0;
+exports.ThemeSassParser = exports.initTheme = exports.normalizeThemeConfigOnce = exports.parseThemeJson = exports.hasThemeJson = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const json_1 = require("./json");
@@ -35,3 +35,187 @@ function initTheme(manifestJson, pagesJson) {
     return (0, uni_shared_1.normalizeStyles)(pagesJson, themeConfig);
 }
 exports.initTheme = initTheme;
+// TODO
+class ThemeSassParser {
+    constructor() {
+        this._index = 0;
+        this._input = '';
+        this._theme = {};
+    }
+    parse(input) {
+        this._index = 0;
+        this._input = input;
+        this._theme = {};
+        this._theme['light'] = {};
+        this._theme['dark'] = {};
+        this.parseVariable();
+        return this._theme;
+    }
+    parseVariable() {
+        this.skipWhiteSpaceAndComments();
+        this.consume('$');
+        this.skipWhiteSpaceAndComments();
+        let key = this.parseString();
+        this.skipWhiteSpaceAndComments();
+        this.consume(':');
+        this.skipWhiteSpace();
+        const value = this.parseVariableValue();
+        if (Array.isArray(value)) {
+            this.pushThemeValue(key, value);
+        }
+        this.consume(';');
+        this.skipWhiteSpaceAndComments();
+        if (this._index < this._input.length) {
+            this.parseVariable();
+        }
+    }
+    parseVariableValue() {
+        switch (this.currentChar) {
+            case 'l':
+                return this.parseFunction();
+            default:
+                return this.skipOtherValue();
+        }
+    }
+    parseFunction() {
+        let functionName = '';
+        while (this.currentChar != '(') {
+            functionName += this.currentChar;
+            if (this._index + 1 < this._input.length) {
+                ++this._index;
+            }
+            else {
+                break;
+            }
+        }
+        if (functionName != 'light-dark') {
+            return this.skipOtherValue();
+        }
+        let valuePair = new Array(2);
+        valuePair[0] = '';
+        valuePair[1] = '';
+        this.consume('(');
+        let index = 0;
+        // TODO rgb?
+        while (this.currentChar != ')') {
+            valuePair[index] += this.currentChar;
+            if (this.currentChar === ',') {
+                index++;
+            }
+            ++this._index;
+        }
+        this.consume(')');
+        valuePair[0] = valuePair[0].trim();
+        valuePair[1] = valuePair[1].trim();
+        return valuePair;
+    }
+    skipOtherValue() {
+        while (this.currentChar != ';') {
+            if (this._index + 1 < this._input.length) {
+                ++this._index;
+            }
+            else {
+                break;
+            }
+        }
+    }
+    parseString() {
+        let str = '';
+        while (this.currentChar != ':') {
+            if (this.currentChar == '\\') {
+                str += this.currentChar;
+                if (this._index + 1 < this._input.length) {
+                    str += this._input[++this._index];
+                }
+            }
+            str += this.currentChar;
+            if (this._index + 1 < this._input.length) {
+                ++this._index;
+            }
+            else {
+                break;
+            }
+        }
+        return str;
+    }
+    pushThemeValue(key, valuePair) {
+        this._theme['light'][key] = valuePair[0];
+        this._theme['dark'][key] = valuePair[1];
+    }
+    consume(expected) {
+        if (this.currentChar != expected) {
+            throw new Error('Unexpected character ' +
+                expected +
+                ' index=' +
+                this._index +
+                ' ' +
+                this.currentChar);
+        }
+        ++this._index;
+    }
+    get currentChar() {
+        if (this._index >= this._input.length) {
+            throw new Error('Unexpected end of input');
+        }
+        return this._input[this._index];
+    }
+    skipWhiteSpaceAndComments() {
+        while (this._index < this._input.length) {
+            const c = this._input[this._index];
+            if (this.isspace(c)) {
+                ++this._index;
+            }
+            else if (c == '/') {
+                this.skipComment();
+            }
+            else {
+                break;
+            }
+        }
+    }
+    skipComment() {
+        if (this.currentChar != '/') {
+            return;
+        }
+        this.consume('/');
+        let nextChar = this.currentChar;
+        if (nextChar == '/') {
+            // Single line comment
+            while (
+            // @ts-expect-error
+            this.currentChar !== '\n' &&
+                this._index < this._input.length - 1) {
+                ++this._index;
+            }
+            this.skipWhiteSpace();
+        }
+        else if (nextChar === '*') {
+            // Multi-line comment
+            while (true) {
+                if (this._index + 1 >= this._input.length) {
+                    throw new Error('Unterminated multi-line comment');
+                }
+                ++this._index;
+                // @ts-expect-error
+                if (this.currentChar === '*' && this._input[this._index + 1] === '/') {
+                    this._index += 2;
+                    break;
+                }
+            }
+            this.skipWhiteSpace();
+        }
+        else {
+            throw new Error('Invalid comment');
+        }
+    }
+    skipWhiteSpace() {
+        while (this._index < this._input.length &&
+            this.isspace(this._input[this._index])) {
+            ++this._index;
+        }
+    }
+    isspace(str) {
+        return str == ' ' || str == '\n' || str == '\r' || str == "'";
+    }
+}
+exports.ThemeSassParser = ThemeSassParser;

package/dist/json/uni-x/uniConfig.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeAppXUniConfig = void 0;
 const uniConfig_1 = require("../app/pages/uniConfig");
+// app-config.js 内容
 function normalizeAppXUniConfig(pagesJson, manifestJson) {
     const config = {
         pages: [],
@@ -16,6 +17,10 @@ function normalizeAppXUniConfig(pagesJson, manifestJson) {
         config.conditionUrl = config.entryPagePath;
         config.entryPagePath = config.realEntryPagePath;
     }
+    // darkmode
+    if (pagesJson.themeConfig) {
+        config.themeConfig = pagesJson.themeConfig;
+    }
     // TODO 待支持分包
     return JSON.stringify(config);
 }

package/dist/uni_modules.d.ts

@@ -70,15 +70,15 @@ export declare const capitalize: (str: string) => string;
  * @returns
  */
 export declare function parseUTSModuleDeps(deps: string[], inputDir: string): string[];
-export declare function genEncryptEasyComModuleIndex(components: string[]): string;
-export declare function parseUniModulesWithComponents(inputDir: string): Record<string, string[]>;
+export declare function genEncryptEasyComModuleIndex(components: Record<string, '.vue' | '.uvue'>): string;
+export declare function parseUniModulesWithComponents(inputDir: string): Record<string, Record<string, ".vue" | ".uvue">>;
 /**
  * 解析 easyCom 组件列表
  * @param pluginId
  * @param inputDir
  * @returns
  */
-export declare function parseEasyComComponents(pluginId: string, inputDir: string, detectBinary?: boolean): string[];
+export declare function parseEasyComComponents(pluginId: string, inputDir: string, detectBinary?: boolean): Record<string, ".vue" | ".uvue">;
 export declare function findEncryptUniModules(inputDir: string, cacheDir?: string): Record<string, EncryptPackageJson | undefined>;
 export declare function findUploadEncryptUniModulesFiles(uniModules: Record<string, EncryptPackageJson | undefined>, platform: typeof process.env.UNI_UTS_PLATFORM, inputDir: string): Record<string, string[]>;
 export declare function packUploadEncryptUniModules(uniModules: Record<string, EncryptPackageJson | undefined>, platform: typeof process.env.UNI_UTS_PLATFORM, inputDir: string, cacheDir: string): {

package/dist/uni_modules.js

@@ -191,20 +191,9 @@ function parseInject(vite = true, platform, language, source, globalObject, defi
                                 const skipCheck = process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE === 'js' &&
                                     source.includes('app-js');
                                 if (!skipCheck) {
-                                    if (language === 'javascript') {
-                                        if (appOptions.js === false) {
-                                            return;
-                                        }
-                                    }
-                                    else if (language === 'kotlin') {
-                                        if (appOptions.kotlin === false) {
-                                            return;
-                                        }
-                                    }
-                                    else if (language === 'swift') {
-                                        if (appOptions.swift === false) {
-                                            return;
-                                        }
+                                    const targetLanguage = language === 'javascript' ? 'js' : language;
+                                    if (targetLanguage && appOptions[targetLanguage] === false) {
+                                        return;
                                     }
                                 }
                             }
@@ -266,9 +255,9 @@ exports.parseUTSModuleDeps = parseUTSModuleDeps;
 function genEncryptEasyComModuleIndex(components) {
     const imports = [];
     const ids = [];
-    components.forEach((component) => {
+    Object.keys(components).forEach((component) => {
         const id = (0, exports.capitalize)((0, exports.camelize)(component));
-        imports.push(`import ${id} from './components/${component}/${component}.vue'`);
+        imports.push(`import ${id} from './components/${component}/${component}${components[component]}'`);
         ids.push(id);
     });
     return `
@@ -302,11 +291,11 @@ exports.parseUniModulesWithComponents = parseUniModulesWithComponents;
  */
 function parseEasyComComponents(pluginId, inputDir, detectBinary = true) {
     const componentsDir = path_1.default.resolve(inputDir, 'uni_modules', pluginId, 'components');
-    const components = [];
+    const components = {};
     if (fs_extra_1.default.existsSync(componentsDir)) {
         fs_extra_1.default.readdirSync(componentsDir).forEach((componentDir) => {
             const componentFile = path_1.default.resolve(componentsDir, componentDir, componentDir);
-            if (['.vue', '.uvue'].some((extname) => {
+            const extname = ['.vue', '.uvue'].find((extname) => {
                 const filename = componentFile + extname;
                 // 探测 filename 是否是二进制文件
                 if (fs_extra_1.default.existsSync(filename)) {
@@ -320,8 +309,9 @@ function parseEasyComComponents(pluginId, inputDir, detectBinary = true) {
                         return true;
                     }
                 }
-            })) {
-                components.push(componentDir);
+            });
+            if (extname) {
+                components[componentDir] = extname;
             }
         });
     }

package/dist/vite/cloud.js

@@ -216,13 +216,14 @@ function initEncryptUniModulesBuildOptions(inputDir) {
     // 生成入口文件
     const input = {};
     moduleNames.forEach((module) => {
-        const indexEncryptFile = path_1.default.resolve(inputDir, 'uni_modules', module, 'index.module.uts');
+        const moduleDir = path_1.default.resolve(inputDir, 'uni_modules', module);
+        const indexEncryptFile = path_1.default.resolve(moduleDir, 'index.module.uts');
         const codes = [];
-        if (hasIndexFile(path_1.default.resolve(inputDir, 'uni_modules', module))) {
+        if (hasIndexFile(moduleDir)) {
             codes.push(`export * from './index'`);
         }
         // easyCom
-        if (modules[module].length) {
+        if (modules[module] && Object.keys(modules[module]).length) {
             codes.push((0, uni_modules_1.genEncryptEasyComModuleIndex)(modules[module]));
         }
         if (codes.length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-4010820240523001",
+  "version": "3.0.0-alpha-4010820240529002",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,8 +26,8 @@
     "@babel/core": "^7.23.3",
     "@babel/parser": "^7.23.9",
     "@babel/types": "^7.20.7",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-4010820240523001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-4010820240523001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-4010820240529002",
+    "@dcloudio/uni-shared": "3.0.0-alpha-4010820240529002",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -71,7 +71,7 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4010820240523001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4010820240529002",
     "@types/adm-zip": "^0.5.5",
     "@types/babel__code-frame": "^7.0.6",
     "@types/babel__core": "^7.1.19",