improvement: inline code generation (#235)

Author: kazupon

packages/core-base/package.json

@@ -23,7 +23,10 @@
   "bugs": {
     "url": "https://github.com/intlify/vue-i18n-next/issues"
   },
-  "files": ["index.js", "dist"],
+  "files": [
+    "index.js",
+    "dist"
+  ],
   "main": "index.js",
   "module": "dist/core-base.esm-bundler.js",
   "unpkg": "dist/core-base.global.js",
@@ -40,7 +43,12 @@
   },
   "buildOptions": {
     "name": "IntlifyCoreBase",
-    "formats": ["esm-bundler", "esm-browser", "cjs", "global"]
+    "formats": [
+      "esm-bundler",
+      "esm-browser",
+      "cjs",
+      "global"
+    ]
   },
   "sideEffects": false
 }

packages/core/package.json

@@ -23,7 +23,10 @@
   "bugs": {
     "url": "https://github.com/intlify/vue-i18n-next/issues"
   },
-  "files": ["index.js", "dist"],
+  "files": [
+    "index.js",
+    "dist"
+  ],
   "main": "index.js",
   "module": "dist/core.esm-bundler.js",
   "unpkg": "dist/core.global.js",

packages/message-compiler/package.json

@@ -23,7 +23,10 @@
   "bugs": {
     "url": "https://github.com/intlify/vue-i18n-next/issues"
   },
-  "files": ["index.js", "dist"],
+  "files": [
+    "index.js",
+    "dist"
+  ],
   "main": "index.js",
   "module": "dist/message-compiler.esm-bundler.js",
   "unpkg": "dist/message-compiler.global.js",
@@ -39,7 +42,12 @@
   },
   "buildOptions": {
     "name": "IntlifyMessageCompiler",
-    "formats": ["esm-bundler", "esm-browser", "cjs", "global"]
+    "formats": [
+      "esm-bundler",
+      "esm-browser",
+      "cjs",
+      "global"
+    ]
   },
   "sideEffects": false
 }

packages/message-compiler/src/generator.ts

@@ -1,4 +1,4 @@
-import { isBoolean, isString } from '@intlify/shared'
+import { isString } from '@intlify/shared'
 import { SourceMapGenerator, RawSourceMap } from 'source-map'
 import {
   ResourceNode,
@@ -30,6 +30,8 @@ type CodeGenContext = {
   indentLevel: number
   filename: string
   line: number
+  breakLineCode: string
+  needIndent: boolean
   column: number
   offset: number
   map?: SourceMapGenerator
@@ -46,17 +48,23 @@ type CodeGenNode =
 type CodeGenerator = {
   context(): CodeGenContext
   push(code: string, node?: CodeGenNode): void
-  indent(): void
-  deindent(withoutNewLine?: boolean): void
+  indent(withNewLine?: boolean): void
+  deindent(withNewLine?: boolean): void
   newline(): void
   helper(key: string): string
+  needIndent(): boolean
 }
 
 function createCodeGenerator(
   ast: ResourceNode,
   options: CodeGenOptions
 ): CodeGenerator {
-  const { sourceMap, filename } = options
+  const {
+    sourceMap,
+    filename,
+    breakLineCode,
+    needIndent: _needIndent
+  } = options
   const _context = {
     source: ast.loc!.source,
     filename,
@@ -65,6 +73,8 @@ function createCodeGenerator(
     line: 1,
     offset: 0,
     map: undefined,
+    breakLineCode,
+    needIndent: _needIndent,
     indentLevel: 0
   } as CodeGenContext
 
@@ -80,27 +90,27 @@ function createCodeGenerator(
     }
   }
 
-  function _newline(n: number): void {
-    push('\n' + `  `.repeat(n))
+  function _newline(n: number, withBreakLine = true): void {
+    const _breakLineCode = withBreakLine ? breakLineCode : ''
+    push(_needIndent ? _breakLineCode! + `  `.repeat(n) : _breakLineCode!)
   }
 
-  function indent(): void {
-    _newline(++_context.indentLevel)
+  function indent(withNewLine = true): void {
+    const level = ++_context.indentLevel
+    withNewLine && _newline(level)
   }
 
-  function deindent(withoutNewLine?: boolean): void {
-    if (withoutNewLine) {
-      --_context.indentLevel
-    } else {
-      _newline(--_context.indentLevel)
-    }
+  function deindent(withNewLine = true): void {
+    const level = --_context.indentLevel
+    withNewLine && _newline(level)
   }
 
   function newline(): void {
     _newline(_context.indentLevel)
   }
 
   const helper = (key: string): string => `_${key}`
+  const needIndent = (): boolean => _context.needIndent
 
   function addMapping(loc: Position, name?: string) {
     _context.map!.addMapping({
@@ -128,7 +138,8 @@ function createCodeGenerator(
     indent,
     deindent,
     newline,
-    helper
+    helper,
+    needIndent
   }
 }
 
@@ -147,9 +158,9 @@ function generateMessageNode(
   generator: CodeGenerator,
   node: MessageNode
 ): void {
-  const { helper } = generator
+  const { helper, needIndent } = generator
   generator.push(`${helper(HelperNameMap.NORMALIZE)}([`)
-  generator.indent()
+  generator.indent(needIndent())
   const length = node.items.length
   for (let i = 0; i < length; i++) {
     generateNode(generator, node.items[i])
@@ -158,15 +169,15 @@ function generateMessageNode(
     }
     generator.push(', ')
   }
-  generator.deindent()
+  generator.deindent(needIndent())
   generator.push('])')
 }
 
 function generatePluralNode(generator: CodeGenerator, node: PluralNode): void {
-  const { helper } = generator
+  const { helper, needIndent } = generator
   if (node.cases.length > 1) {
     generator.push(`${helper(HelperNameMap.PLURAL)}([`)
-    generator.indent()
+    generator.indent(needIndent())
     const length = node.cases.length
     for (let i = 0; i < length; i++) {
       generateNode(generator, node.cases[i])
@@ -175,7 +186,7 @@ function generatePluralNode(generator: CodeGenerator, node: PluralNode): void {
       }
       generator.push(', ')
     }
-    generator.deindent()
+    generator.deindent(needIndent())
     generator.push(`])`)
   }
 }
@@ -256,12 +267,25 @@ export const generate = (
   const filename = isString(options.filename)
     ? options.filename
     : 'message.intl'
-  const sourceMap = isBoolean(options.sourceMap) ? options.sourceMap : false
+  const sourceMap = !!options.sourceMap
+  // prettier-ignore
+  const breakLineCode = options.breakLineCode != null
+    ? options.breakLineCode
+    : mode === 'arrow'
+      ? ';'
+      : '\n'
+  const needIndent = options.needIndent ? options.needIndent : mode !== 'arrow'
   const helpers = ast.helpers || []
-  const generator = createCodeGenerator(ast, { mode, filename, sourceMap })
+  const generator = createCodeGenerator(ast, {
+    mode,
+    filename,
+    sourceMap,
+    breakLineCode,
+    needIndent
+  })
 
   generator.push(mode === 'normal' ? `function __msg__ (ctx) {` : `(ctx) => {`)
-  generator.indent()
+  generator.indent(needIndent)
 
   if (helpers.length > 0) {
     generator.push(
@@ -272,7 +296,7 @@ export const generate = (
 
   generator.push(`return `)
   generateNode(generator, ast)
-  generator.deindent()
+  generator.deindent(needIndent)
   generator.push(`}`)
 
   const { code, map } = generator.context()

packages/message-compiler/src/options.ts

@@ -19,6 +19,8 @@ export interface TransformOptions {
 
 export interface CodeGenOptions {
   mode?: 'normal' | 'arrow' // default normal
+  breakLineCode?: '\n' | ';' // default newline
+  needIndent?: boolean // default true
   onError?: CompileErrorHandler
   // Generate source map?
   // - Default: false

packages/message-compiler/test/__snapshots__/compiler.test.ts.snap

@@ -247,6 +247,24 @@ exports[`@.caml:{'no apples'} | {0} apple | {n}　apples: code 1`] = `
 
 exports[`@.caml:{'no apples'} | {0} apple | {n}　apples: map 1`] = `undefined`;
 
+exports[`arrow mode  | | | : code 1`] = `"(ctx) => {const { normalize: _normalize, plural: _plural } = ctx;return _plural([_normalize([]), _normalize([]), _normalize([]), _normalize([])])}"`;
+
+exports[`arrow mode !#%^&*()-_+=[]:;?.<>"\`: code 1`] = `"(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"hi \\", \\"!#%^&*()-_+=[]:;?.<>\\\\\\"\`\\", \\" !\\"])}"`;
+
+exports[`arrow mode @.caml:{'no apples'} | {0} apple | {n}　apples: code 1`] = `"(ctx) => {const { normalize: _normalize, linked: _linked, interpolate: _interpolate, list: _list, named: _named, plural: _plural } = ctx;return _plural([_normalize([_linked(\\"no apples\\", \\"caml\\")]), _normalize([_interpolate(_list(0)), \\" apple\\"]), _normalize([_interpolate(_named(\\"n\\")), \\"　apples\\"])])}"`;
+
+exports[`arrow mode hello world: code 1`] = `"(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"hello world\\"])}"`;
+
+exports[`arrow mode hello\\n world: code 1`] = `"(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"hello\\\\n world\\"])}"`;
+
+exports[`arrow mode hi @.upper:{'name'} !: code 1`] = `"(ctx) => {const { normalize: _normalize, linked: _linked } = ctx;return _normalize([\\"hi \\", _linked(\\"name\\", \\"upper\\"), \\" !\\"])}"`;
+
+exports[`arrow mode hi { 'kazupon' }!: code 1`] = `"(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"hi \\", \\"kazupon\\", \\"!\\"])}"`;
+
+exports[`arrow mode hi {0}!: code 1`] = `"(ctx) => {const { normalize: _normalize, interpolate: _interpolate, list: _list } = ctx;return _normalize([\\"hi \\", _interpolate(_list(0)), \\"!\\"])}"`;
+
+exports[`arrow mode hi {name}!: code 1`] = `"(ctx) => {const { normalize: _normalize, interpolate: _interpolate, named: _named } = ctx;return _normalize([\\"hi \\", _interpolate(_named(\\"name\\")), \\"!\\"])}"`;
+
 exports[`edge cases  | | | : code 1`] = `
 "function __msg__ (ctx) {
   const { normalize: _normalize, plural: _plural } = ctx