@intlify/bundle-utils 5.2.0 → 5.3.1

package/lib/codegen.d.ts

@@ -24,6 +24,7 @@ export interface SourceLocationable {
  */
 export interface CodeGenOptions {
     type?: 'plain' | 'sfc' | 'bare';
+    legacy?: boolean;
     bridge?: boolean;
     exportESM?: boolean;
     source?: string;

package/lib/js.js

@@ -113,12 +113,7 @@ function generateNode(generator, node, options, injector) {
     const { forceStringify } = generator.context();
     const codeMaps = new Map();
     const { type, bridge, exportESM, sourceMap, isGlobal, locale, useClassComponent } = options;
-    // prettier-ignore
-    const componentNamespace = bridge
-        ? `Component.options`
-        : useClassComponent
-            ? `Component.__o`
-            : `Component`;
+    const componentNamespace = '_Component';
     (0, estree_walker_1.walk)(node, {
         /**
          * NOTE:
@@ -144,6 +139,14 @@ function generateNode(generator, node, options, injector) {
                             : `export default`;
                         generator.push(`${exportSyntax} function (Component) {`);
                         generator.indent();
+                        // prettier-ignore
+                        const componentVariable = bridge
+                            ? `Component.options || Component`
+                            : useClassComponent
+                                ? `Component.__o || Component`
+                                : `Component`;
+                        // prettier-ignore
+                        generator.pushline(`const ${componentNamespace} = ${componentVariable}`);
                         generator.pushline(`${componentNamespace}.${variableName} = ${componentNamespace}.${variableName} || []`);
                         generator.push(`${componentNamespace}.${variableName}.push({`);
                         generator.indent();

package/lib/json.d.ts

@@ -7,4 +7,4 @@ import type { CodeGenOptions, CodeGenResult } from './codegen';
 /**
  * @internal
  */
-export declare function generate(targetSource: string | Buffer, { type, bridge, exportESM, filename, inSourceMap, locale, isGlobal, sourceMap, env, forceStringify, onError, useClassComponent }: CodeGenOptions, injector?: () => string): CodeGenResult<JSONProgram>;
+export declare function generate(targetSource: string | Buffer, { type, legacy, bridge, exportESM, filename, inSourceMap, locale, isGlobal, sourceMap, env, forceStringify, onError, useClassComponent }: CodeGenOptions, injector?: () => string): CodeGenResult<JSONProgram>;

package/lib/json.js

@@ -2,15 +2,20 @@
 /**
  * Code generator for i18n json/json5 resource
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = void 0;
 const jsonc_eslint_parser_1 = require("jsonc-eslint-parser");
 const shared_1 = require("@intlify/shared");
 const codegen_1 = require("./codegen");
+const legacy_1 = require("./legacy");
+const magic_string_1 = __importDefault(require("magic-string"));
 /**
  * @internal
  */
-function generate(targetSource, { type = 'plain', bridge = false, exportESM = false, filename = 'vue-i18n-loader.json', inSourceMap = undefined, locale = '', isGlobal = false, sourceMap = false, env = 'development', forceStringify = false, onError = undefined, useClassComponent = false }, injector) {
+function generate(targetSource, { type = 'plain', legacy = false, bridge = false, exportESM = false, filename = 'vue-i18n-loader.json', inSourceMap = undefined, locale = '', isGlobal = false, sourceMap = false, env = 'development', forceStringify = false, onError = undefined, useClassComponent = false }, injector) {
     const target = Buffer.isBuffer(targetSource)
         ? targetSource.toString()
         : targetSource;
@@ -35,6 +40,21 @@ function generate(targetSource, { type = 'plain', bridge = false, exportESM = fa
     };
     const generator = (0, codegen_1.createCodeGenerator)(options);
     const ast = (0, jsonc_eslint_parser_1.parseJSON)(value, { filePath: filename });
+    // for vue 2.x
+    if (legacy && type === 'sfc') {
+        const gen = () => (0, shared_1.friendlyJSONstringify)((0, jsonc_eslint_parser_1.getStaticJSONValue)(ast));
+        const code = (0, legacy_1.generateLegacyCode)(options, gen);
+        const s = new magic_string_1.default(code);
+        return {
+            ast,
+            code: s.toString(),
+            map: s.generateMap({
+                file: filename,
+                source: value,
+                includeContent: true
+            })
+        };
+    }
     const codeMaps = generateNode(generator, ast, options, injector);
     const { code, map } = generator.context();
     // if (map) {
@@ -61,12 +81,7 @@ function generateNode(generator, node, options, injector) {
     const { forceStringify } = generator.context();
     const codeMaps = new Map();
     const { type, bridge, exportESM, sourceMap, isGlobal, locale, useClassComponent } = options;
-    // prettier-ignore
-    const componentNamespace = bridge
-        ? `Component.options`
-        : useClassComponent
-            ? `Component.__o`
-            : `Component`;
+    const componentNamespace = '_Component';
     (0, jsonc_eslint_parser_1.traverseNodes)(node, {
         enterNode(node, parent) {
             switch (node.type) {
@@ -85,6 +100,14 @@ function generateNode(generator, node, options, injector) {
                             : `export default`;
                         generator.push(`${exportSyntax} function (Component) {`);
                         generator.indent();
+                        // prettier-ignore
+                        const componentVariable = bridge
+                            ? `Component.options || Component`
+                            : useClassComponent
+                                ? `Component.__o || Component`
+                                : `Component`;
+                        // prettier-ignore
+                        generator.pushline(`const ${componentNamespace} = ${componentVariable}`);
                         generator.pushline(`${componentNamespace}.${variableName} = ${componentNamespace}.${variableName} || []`);
                         generator.push(`${componentNamespace}.${variableName}.push({`);
                         generator.indent();

package/lib/legacy.d.ts

@@ -0,0 +1,2 @@
+import type { CodeGenOptions } from './codegen';
+export declare function generateLegacyCode({ isGlobal }: CodeGenOptions, generator: () => string): string;

package/lib/legacy.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateLegacyCode = void 0;
+const shared_1 = require("@intlify/shared");
+function generateLegacyCode({ isGlobal }, generator) {
+    // prettier-ignore
+    const componentNamespace = `Component.options`;
+    const variableName = !isGlobal ? '__i18n' : '__i18nGlobal';
+    const exportSyntax = 'export default';
+    const code = `${exportSyntax} function (Component) {
+  ${componentNamespace}.${variableName} = ${componentNamespace}.${variableName} || []
+  ${componentNamespace}.${variableName}.push(${(0, shared_1.friendlyJSONstringify)(generator())})
+  delete ${componentNamespace}._Ctor
+}`;
+    return code;
+}
+exports.generateLegacyCode = generateLegacyCode;

package/lib/yaml.d.ts

@@ -7,4 +7,4 @@ import type { CodeGenOptions, CodeGenResult } from './codegen';
 /**
  * @internal
  */
-export declare function generate(targetSource: string | Buffer, { type, bridge, exportESM, useClassComponent, filename, inSourceMap, locale, isGlobal, sourceMap, env, forceStringify, onError }: CodeGenOptions, injector?: () => string): CodeGenResult<YAMLProgram>;
+export declare function generate(targetSource: string | Buffer, { type, legacy, bridge, exportESM, useClassComponent, filename, inSourceMap, locale, isGlobal, sourceMap, env, forceStringify, onError }: CodeGenOptions, injector?: () => string): CodeGenResult<YAMLProgram>;

package/lib/yaml.js

@@ -2,15 +2,20 @@
 /**
  * Code generator for i18n yaml resource
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = void 0;
 const shared_1 = require("@intlify/shared");
 const codegen_1 = require("./codegen");
 const yaml_eslint_parser_1 = require("yaml-eslint-parser");
+const legacy_1 = require("./legacy");
+const magic_string_1 = __importDefault(require("magic-string"));
 /**
  * @internal
  */
-function generate(targetSource, { type = 'plain', bridge = false, exportESM = false, useClassComponent = false, filename = 'vue-i18n-loader.yaml', inSourceMap = undefined, locale = '', isGlobal = false, sourceMap = false, env = 'development', forceStringify = false, onError = undefined }, injector) {
+function generate(targetSource, { type = 'plain', legacy = false, bridge = false, exportESM = false, useClassComponent = false, filename = 'vue-i18n-loader.yaml', inSourceMap = undefined, locale = '', isGlobal = false, sourceMap = false, env = 'development', forceStringify = false, onError = undefined }, injector) {
     const value = Buffer.isBuffer(targetSource)
         ? targetSource.toString()
         : targetSource;
@@ -31,6 +36,21 @@ function generate(targetSource, { type = 'plain', bridge = false, exportESM = fa
     };
     const generator = (0, codegen_1.createCodeGenerator)(options);
     const ast = (0, yaml_eslint_parser_1.parseYAML)(value, { filePath: filename });
+    // for vue 2.x
+    if (legacy && type === 'sfc') {
+        const gen = () => (0, shared_1.friendlyJSONstringify)((0, yaml_eslint_parser_1.getStaticYAMLValue)(ast));
+        const code = (0, legacy_1.generateLegacyCode)(options, gen);
+        const s = new magic_string_1.default(code);
+        return {
+            ast,
+            code: s.toString(),
+            map: s.generateMap({
+                file: filename,
+                source: value,
+                includeContent: true
+            })
+        };
+    }
     const codeMaps = generateNode(generator, ast, options, injector);
     const { code, map } = generator.context();
     // prettier-ignore
@@ -51,12 +71,7 @@ function generateNode(generator, node, options, injector) {
     const { forceStringify } = generator.context();
     const codeMaps = new Map();
     const { type, bridge, exportESM, sourceMap, isGlobal, locale, useClassComponent } = options;
-    // prettier-ignore
-    const componentNamespace = bridge
-        ? `Component.options`
-        : useClassComponent
-            ? `Component.__o`
-            : `Component`;
+    const componentNamespace = '_Component';
     (0, yaml_eslint_parser_1.traverseNodes)(node, {
         enterNode(node, parent) {
             switch (node.type) {
@@ -74,6 +89,14 @@ function generateNode(generator, node, options, injector) {
                             : `export default`;
                         generator.push(`${exportSyntax} function (Component) {`);
                         generator.indent();
+                        // prettier-ignore
+                        const componentVariable = bridge
+                            ? `Component.options || Component`
+                            : useClassComponent
+                                ? `Component.__o || Component`
+                                : `Component`;
+                        // prettier-ignore
+                        generator.pushline(`const ${componentNamespace} = ${componentVariable}`);
                         generator.pushline(`${componentNamespace}.${variableName} = ${componentNamespace}.${variableName} || []`);
                         generator.push(`${componentNamespace}.${variableName}.push({`);
                         generator.indent();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@intlify/bundle-utils",
   "description": "Bundle utilities for Intlify project",
-  "version": "5.2.0",
+  "version": "5.3.1",
   "author": {
     "name": "kazuya kawaguchi",
     "email": "kawakazu80@gmail.com"
@@ -23,6 +23,7 @@
     "acorn": "^8.8.2",
     "estree-walker": "^2.0.2",
     "jsonc-eslint-parser": "^1.0.1",
+    "magic-string": "^0.30.0",
     "source-map": "0.6.1",
     "yaml-eslint-parser": "^0.3.2"
   },