projen 0.92.4 → 0.92.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.jsii +2 -2
- package/lib/awscdk/auto-discover.js +5 -5
- package/lib/awscdk/awscdk-app-java.js +1 -1
- package/lib/awscdk/awscdk-app-py.js +1 -1
- package/lib/awscdk/awscdk-app-ts.js +1 -1
- package/lib/awscdk/awscdk-construct.js +2 -2
- package/lib/awscdk/awscdk-deps-java.js +1 -1
- package/lib/awscdk/awscdk-deps-js.js +1 -1
- package/lib/awscdk/awscdk-deps-py.js +1 -1
- package/lib/awscdk/awscdk-deps.js +1 -1
- package/lib/awscdk/cdk-config.js +1 -1
- package/lib/awscdk/cdk-tasks.js +1 -1
- package/lib/awscdk/integration-test.js +1 -1
- package/lib/awscdk/lambda-extension.js +1 -1
- package/lib/awscdk/lambda-function.js +2 -2
- package/lib/build/build-workflow.js +1 -1
- package/lib/cdk/auto-discover-base.js +2 -2
- package/lib/cdk/construct-lib.js +1 -1
- package/lib/cdk/integration-test-base.js +1 -1
- package/lib/cdk/jsii-docgen.js +1 -1
- package/lib/cdk/jsii-project.js +1 -1
- package/lib/cdk8s/auto-discover.js +2 -2
- package/lib/cdk8s/cdk8s-app-py.js +1 -1
- package/lib/cdk8s/cdk8s-app-ts.js +1 -1
- package/lib/cdk8s/cdk8s-construct.js +1 -1
- package/lib/cdk8s/cdk8s-deps-py.js +1 -1
- package/lib/cdk8s/cdk8s-deps.js +1 -1
- package/lib/cdk8s/integration-test.js +1 -1
- package/lib/cdktf/cdktf-construct.js +1 -1
- package/lib/circleci/circleci.js +1 -1
- package/lib/component.js +1 -1
- package/lib/dependencies.js +1 -1
- package/lib/dev-env.js +1 -1
- package/lib/docker-compose/docker-compose-service.js +1 -1
- package/lib/docker-compose/docker-compose.js +1 -1
- package/lib/file.js +1 -1
- package/lib/gitattributes.js +1 -1
- package/lib/github/actions-provider.js +1 -1
- package/lib/github/auto-approve.js +1 -1
- package/lib/github/auto-merge.js +1 -1
- package/lib/github/auto-queue.js +1 -1
- package/lib/github/dependabot.js +1 -1
- package/lib/github/github-credentials.js +1 -1
- package/lib/github/github-project.js +1 -1
- package/lib/github/github.js +1 -1
- package/lib/github/merge-queue.js +1 -1
- package/lib/github/mergify.js +1 -1
- package/lib/github/pr-template.js +1 -1
- package/lib/github/pull-request-backport.js +1 -1
- package/lib/github/pull-request-lint.js +1 -1
- package/lib/github/stale.js +1 -1
- package/lib/github/task-workflow-job.js +1 -1
- package/lib/github/task-workflow.js +1 -1
- package/lib/github/workflow-actions.js +1 -1
- package/lib/github/workflow-jobs.js +1 -1
- package/lib/github/workflow-steps.js +1 -1
- package/lib/github/workflows.js +1 -1
- package/lib/gitlab/configuration.js +1 -1
- package/lib/gitlab/gitlab-configuration.js +1 -1
- package/lib/gitlab/nested-configuration.js +1 -1
- package/lib/gitpod.js +1 -1
- package/lib/ignore-file.js +1 -1
- package/lib/ini.js +1 -1
- package/lib/java/java-project.js +1 -1
- package/lib/java/junit.js +1 -1
- package/lib/java/maven-compile.js +1 -1
- package/lib/java/maven-packaging.js +1 -1
- package/lib/java/maven-sample.js +1 -1
- package/lib/java/pom.js +2 -2
- package/lib/java/projenrc.js +1 -1
- package/lib/javascript/bundler.js +1 -1
- package/lib/javascript/eslint.js +1 -1
- package/lib/javascript/jest.js +4 -4
- package/lib/javascript/license-checker.js +1 -1
- package/lib/javascript/node-package.js +1 -1
- package/lib/javascript/node-project.js +1 -1
- package/lib/javascript/npm-config.js +1 -1
- package/lib/javascript/prettier.js +1 -1
- package/lib/javascript/projenrc.js +1 -1
- package/lib/javascript/typescript-config.js +2 -2
- package/lib/javascript/upgrade-dependencies.js +2 -2
- package/lib/javascript/yarnrc.js +1 -1
- package/lib/json-patch.js +1 -1
- package/lib/json.js +1 -1
- package/lib/license.js +1 -1
- package/lib/logger.js +1 -1
- package/lib/makefile.js +1 -1
- package/lib/object-file.js +1 -1
- package/lib/project-build.js +1 -1
- package/lib/project-tree.js +1 -1
- package/lib/project.js +1 -1
- package/lib/projects.js +1 -1
- package/lib/projenrc-json.js +2 -2
- package/lib/projenrc.js +1 -1
- package/lib/python/pip.js +1 -1
- package/lib/python/poetry.js +2 -2
- package/lib/python/projenrc.js +1 -1
- package/lib/python/pytest-sample.js +1 -1
- package/lib/python/pytest.js +1 -1
- package/lib/python/python-project.js +1 -1
- package/lib/python/python-sample.js +1 -1
- package/lib/python/requirements-file.js +1 -1
- package/lib/python/setuppy.js +1 -1
- package/lib/python/setuptools.js +1 -1
- package/lib/python/venv.js +1 -1
- package/lib/readme.js +1 -1
- package/lib/release/publisher.js +1 -1
- package/lib/release/release-trigger.js +1 -1
- package/lib/release/release.js +1 -1
- package/lib/renovatebot.js +1 -1
- package/lib/sample-file.js +2 -2
- package/lib/semver.js +1 -1
- package/lib/source-code.js +1 -1
- package/lib/task-runtime.js +1 -1
- package/lib/task.js +1 -1
- package/lib/tasks.js +1 -1
- package/lib/testing.js +1 -1
- package/lib/textfile.js +1 -1
- package/lib/toml.js +1 -1
- package/lib/typescript/projenrc-ts.js +1 -1
- package/lib/typescript/projenrc.js +1 -1
- package/lib/typescript/typescript-typedoc.js +1 -1
- package/lib/typescript/typescript.js +6 -6
- package/lib/version.js +2 -2
- package/lib/vscode/devcontainer.js +1 -1
- package/lib/vscode/extensions.js +1 -1
- package/lib/vscode/launch-config.js +1 -1
- package/lib/vscode/settings.js +1 -1
- package/lib/vscode/vscode.js +1 -1
- package/lib/web/next.js +3 -3
- package/lib/web/postcss.js +1 -1
- package/lib/web/react.js +4 -4
- package/lib/web/tailwind.js +1 -1
- package/lib/xmlfile.js +1 -1
- package/lib/yaml.js +1 -1
- package/node_modules/yaml/browser/dist/compose/resolve-props.js +2 -4
- package/node_modules/yaml/browser/dist/compose/util-empty-scalar-position.js +1 -2
- package/node_modules/yaml/browser/dist/doc/anchors.js +1 -2
- package/node_modules/yaml/browser/dist/doc/createNode.js +1 -2
- package/node_modules/yaml/browser/dist/nodes/Alias.js +24 -11
- package/node_modules/yaml/browser/dist/nodes/YAMLMap.js +1 -1
- package/node_modules/yaml/browser/dist/nodes/addPairToJSMap.js +1 -0
- package/node_modules/yaml/browser/dist/schema/tags.js +3 -3
- package/node_modules/yaml/browser/dist/schema/yaml-1.1/binary.js +1 -2
- package/node_modules/yaml/browser/dist/schema/yaml-1.1/pairs.js +1 -1
- package/node_modules/yaml/browser/dist/stringify/stringify.js +3 -4
- package/node_modules/yaml/browser/dist/stringify/stringifyString.js +3 -4
- package/node_modules/yaml/dist/cli.d.ts +1 -1
- package/node_modules/yaml/dist/cli.mjs +5 -3
- package/node_modules/yaml/dist/compose/composer.js +1 -1
- package/node_modules/yaml/dist/compose/resolve-props.js +2 -4
- package/node_modules/yaml/dist/compose/util-empty-scalar-position.js +1 -2
- package/node_modules/yaml/dist/doc/anchors.js +1 -2
- package/node_modules/yaml/dist/doc/createNode.js +1 -2
- package/node_modules/yaml/dist/log.js +1 -1
- package/node_modules/yaml/dist/nodes/Alias.d.ts +1 -1
- package/node_modules/yaml/dist/nodes/Alias.js +23 -10
- package/node_modules/yaml/dist/nodes/addPairToJSMap.js +1 -0
- package/node_modules/yaml/dist/nodes/toJS.d.ts +2 -0
- package/node_modules/yaml/dist/parse/parser.js +1 -1
- package/node_modules/yaml/dist/schema/yaml-1.1/binary.js +2 -3
- package/node_modules/yaml/dist/stringify/stringify.js +3 -4
- package/node_modules/yaml/dist/stringify/stringifyString.js +2 -3
- package/node_modules/yaml/package.json +2 -2
- package/package.json +1 -1
package/lib/web/react.js
CHANGED
|
@@ -38,7 +38,7 @@ class ReactProject extends javascript_1.NodeProject {
|
|
|
38
38
|
}
|
|
39
39
|
exports.ReactProject = ReactProject;
|
|
40
40
|
_a = JSII_RTTI_SYMBOL_1;
|
|
41
|
-
ReactProject[_a] = { fqn: "projen.web.ReactProject", version: "0.92.
|
|
41
|
+
ReactProject[_a] = { fqn: "projen.web.ReactProject", version: "0.92.5" };
|
|
42
42
|
/**
|
|
43
43
|
* React project using TypeScript.
|
|
44
44
|
*
|
|
@@ -107,7 +107,7 @@ class ReactTypeScriptProject extends typescript_1.TypeScriptAppProject {
|
|
|
107
107
|
}
|
|
108
108
|
exports.ReactTypeScriptProject = ReactTypeScriptProject;
|
|
109
109
|
_b = JSII_RTTI_SYMBOL_1;
|
|
110
|
-
ReactTypeScriptProject[_b] = { fqn: "projen.web.ReactTypeScriptProject", version: "0.92.
|
|
110
|
+
ReactTypeScriptProject[_b] = { fqn: "projen.web.ReactTypeScriptProject", version: "0.92.5" };
|
|
111
111
|
class ReactComponent extends component_1.Component {
|
|
112
112
|
constructor(project, options) {
|
|
113
113
|
super(project);
|
|
@@ -167,7 +167,7 @@ class ReactComponent extends component_1.Component {
|
|
|
167
167
|
}
|
|
168
168
|
exports.ReactComponent = ReactComponent;
|
|
169
169
|
_c = JSII_RTTI_SYMBOL_1;
|
|
170
|
-
ReactComponent[_c] = { fqn: "projen.web.ReactComponent", version: "0.92.
|
|
170
|
+
ReactComponent[_c] = { fqn: "projen.web.ReactComponent", version: "0.92.5" };
|
|
171
171
|
class ReactSampleCode extends component_1.Component {
|
|
172
172
|
constructor(project, options) {
|
|
173
173
|
super(project);
|
|
@@ -357,5 +357,5 @@ class ReactTypeDef extends file_1.FileBase {
|
|
|
357
357
|
}
|
|
358
358
|
exports.ReactTypeDef = ReactTypeDef;
|
|
359
359
|
_d = JSII_RTTI_SYMBOL_1;
|
|
360
|
-
ReactTypeDef[_d] = { fqn: "projen.web.ReactTypeDef", version: "0.92.
|
|
360
|
+
ReactTypeDef[_d] = { fqn: "projen.web.ReactTypeDef", version: "0.92.5" };
|
|
361
361
|
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"react.js","sourceRoot":"","sources":["../../src/web/react.ts"],"names":[],"mappings":"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","sourcesContent":["import * as path from \"path\";\nimport { Component } from \"../component\";\nimport { FileBase, FileBaseOptions, IResolver } from \"../file\";\nimport {\n  NodeProject,\n  NodeProjectOptions,\n  TypeScriptJsxMode,\n  TypeScriptModuleResolution,\n} from \"../javascript\";\nimport { SampleDir } from \"../sample-file\";\nimport { SourceCode } from \"../source-code\";\nimport { TypeScriptAppProject, TypeScriptProjectOptions } from \"../typescript\";\nimport { deepMerge } from \"../util\";\n\nexport interface ReactRewireOptions {\n  /**\n   * Rewire webpack configuration.\n   *\n   * Use this property to override webpack configuration properties provided\n   * by create-react-app, without needing to eject.\n   *\n   * This property will create a `config-overrides.js` file in your root directory,\n   * which will contain the desired rewiring code.\n   *\n   * To **override** the configuration, you can provide simple key value pairs.\n   * Keys take the form of js code directives that traverse to the desired property.\n   * Values should be JSON serializable objects.\n   *\n   * For example, the following config:\n   *\n   * ```json\n   * rewire: { \"module.unknownContextCritical\": false }\n   * ```\n   *\n   * Will translate to the following `config-overrides.js` file:\n   *\n   * ```js\n   * module.exports = function override(config, env) {\n   *   config.module.unknownContextCritical = false;\n   * }\n   * ```\n   *\n   * @default - No rewired config.\n   *\n   * @see https://webpack.js.org/configuration/\n   * @see https://github.com/timarney/react-app-rewired\n   */\n  readonly rewire?: { [key: string]: any };\n}\n\nexport interface ReactTypeScriptProjectOptions\n  extends TypeScriptProjectOptions,\n    ReactRewireOptions {}\n\nexport interface ReactProjectOptions\n  extends NodeProjectOptions,\n    ReactRewireOptions {\n  /**\n   * Source directory.\n   *\n   * @default \"src\"\n   */\n  readonly srcdir?: string;\n  /**\n   * Generate one-time sample in `src/` and `public/` if there are no files there.\n   * @default true\n   */\n  readonly sampleCode?: boolean;\n}\n\n/**\n * React project using JavaScript.\n *\n * @pjid react\n */\nexport class ReactProject extends NodeProject {\n  /**\n   * The directory in which source files reside.\n   * @default \"src\"\n   */\n  public readonly srcdir: string;\n\n  constructor(options: ReactProjectOptions) {\n    super({\n      jest: false,\n      ...options,\n    });\n\n    this.srcdir = options.srcdir ?? \"src\";\n\n    new ReactComponent(this, { typescript: false, rewire: options.rewire });\n\n    // generate sample code in `src` and `public` if these directories are empty or non-existent.\n    if (options.sampleCode ?? true) {\n      new ReactSampleCode(this, {\n        fileExt: \"jsx\",\n        srcdir: this.srcdir,\n      });\n      new SampleDir(this, \"public\", {\n        sourceDir: path.join(__dirname, \"..\", \"..\", \"assets\", \"web\", \"react\"),\n      });\n    }\n  }\n}\n\n/**\n * React project using TypeScript.\n *\n * @pjid react-ts\n */\nexport class ReactTypeScriptProject extends TypeScriptAppProject {\n  /**\n   * The directory in which source files reside.\n   */\n  public readonly srcdir: string;\n\n  constructor(options: ReactTypeScriptProjectOptions) {\n    const defaultOptions = {\n      srcdir: \"src\",\n      eslint: true,\n      jest: false,\n      tsconfig: {\n        include: [\"src\"],\n        compilerOptions: {\n          target: \"es5\",\n          lib: [\"dom\", \"dom.iterable\", \"esnext\"],\n          allowJs: true,\n          skipLibCheck: true,\n          esModuleInterop: true,\n          allowSyntheticDefaultImports: true,\n          strict: true,\n          forceConsistentCasingInFileNames: true,\n          noFallthroughCasesInSwitch: true,\n          module: \"commonjs\",\n          moduleResolution: TypeScriptModuleResolution.NODE,\n          resolveJsonModule: true,\n          isolatedModules: true,\n          noEmit: true,\n          jsx: TypeScriptJsxMode.REACT_JSX,\n        },\n      },\n      typescriptVersion: options.typescriptVersion ?? \"^4.0.3\",\n    };\n\n    // never generate default TypeScript sample code, since this class provides its own\n    super(\n      deepMerge([\n        defaultOptions,\n        options,\n        { sampleCode: false },\n      ]) as TypeScriptProjectOptions\n    );\n\n    this.srcdir = options.srcdir ?? \"src\";\n\n    this.eslint?.addRules({\n      \"import/no-extraneous-dependencies\": [\n        \"error\",\n        {\n          devDependencies: [\"**/src/**/*.test.tsx\", \"**/src/setupTests.ts\"],\n          optionalDependencies: false,\n          peerDependencies: true,\n        },\n      ],\n    });\n\n    new ReactComponent(this, { typescript: true, rewire: options.rewire });\n\n    // generate sample code in `src` and `public` if these directories are empty or non-existent.\n    if (options.sampleCode ?? true) {\n      new ReactSampleCode(this, {\n        fileExt: \"tsx\",\n        srcdir: this.srcdir,\n      });\n      new SampleDir(this, \"public\", {\n        sourceDir: path.join(__dirname, \"..\", \"..\", \"assets\", \"web\", \"react\"),\n      });\n    }\n\n    this.package.addPackageResolutions(\n      // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/62300\n      \"@types/express@4.17.13\",\n      \"@types/express-serve-static-core@4.17.30\"\n    );\n  }\n}\n\nexport interface ReactComponentOptions extends ReactRewireOptions {\n  /**\n   * Whether to apply options specific for TypeScript React projects.\n   *\n   * @default false\n   */\n  readonly typescript?: boolean;\n}\n\nexport class ReactComponent extends Component {\n  private readonly typescript: boolean;\n\n  constructor(project: NodeProject, options: ReactComponentOptions) {\n    super(project);\n\n    this.typescript = options.typescript ?? false;\n\n    // No compile for react app\n    project.compileTask.reset();\n\n    project.addDeps(\"react\", \"react-dom\", \"web-vitals\");\n    project.addDevDeps(\n      \"react-scripts@^5\",\n      \"@testing-library/jest-dom\",\n      \"@testing-library/react\",\n      \"@testing-library/user-event\"\n    );\n    if (this.typescript) {\n      project.addDevDeps(\"@types/jest\", \"@types/react\", \"@types/react-dom\");\n    }\n\n    const rewire = options.rewire ?? false;\n\n    if (rewire) {\n      const overridesPath = \".projen/react-config-overrides.js\";\n      project.addDevDeps(\"react-app-rewired\");\n      project.addFields({ \"config-overrides-path\": overridesPath });\n\n      const configOverrides = new SourceCode(this.project, overridesPath);\n      if (!configOverrides.marker) {\n        configOverrides.line(`// ${configOverrides.marker}`);\n      }\n      configOverrides.line(\"/**\");\n      configOverrides.line(\n        \" * Override CRA configuration without needing to eject.\"\n      );\n      configOverrides.line(\" *\");\n      configOverrides.line(\n        \" * @see https://www.npmjs.com/package/react-app-rewired\"\n      );\n      configOverrides.line(\" */\");\n      configOverrides.open(\"module.exports = function override(config, env) {\");\n      for (const [key, value] of Object.entries(rewire)) {\n        configOverrides.line(`config.${key} = ${JSON.stringify(value)};`);\n      }\n      configOverrides.line(\"return config;\");\n      configOverrides.close(\"};\");\n    }\n\n    const reactScripts = rewire ? \"react-app-rewired\" : \"react-scripts\";\n\n    // Create React App CLI commands, see: https://create-react-app.dev/docs/available-scripts/\n    project.addTask(\"dev\", {\n      description: \"Starts the react application\",\n      exec: `${reactScripts} start`,\n    });\n\n    project.compileTask.exec(`${reactScripts} build`);\n\n    project.testTask.exec(`${reactScripts} test --watchAll=false`);\n\n    const testWatch = project.tasks.tryFind(\"test:watch\");\n    testWatch?.reset(`${reactScripts} test`);\n\n    project.npmignore?.exclude(\"# Build\", \"/build/\");\n    project.gitignore.exclude(\"# Build\", \"/build/\");\n\n    project.package.addField(\"eslintConfig\", {\n      extends: [\"react-app\", \"react-app/jest\"],\n    });\n\n    project.package.addField(\"browserslist\", {\n      production: [\">0.2%\", \"not dead\", \"not op_mini all\"],\n      development: [\n        \"last 1 chrome version\",\n        \"last 1 firefox version\",\n        \"last 1 safari version\",\n      ],\n    });\n  }\n}\n\ninterface ReactSampleCodeOptions {\n  /**\n   * File extension for sample javascript code to be saved as.\n   *\n   * @default \"jsx\"\n   */\n  readonly fileExt?: string;\n\n  /**\n   * The directory in which React jsx files are declared.\n   */\n  readonly srcdir: string;\n}\n\nclass ReactSampleCode extends Component {\n  private readonly fileExt: string;\n  private readonly srcdir: string;\n\n  constructor(project: NodeProject, options: ReactSampleCodeOptions) {\n    super(project);\n\n    this.fileExt = options.fileExt ?? \"jsx\";\n    this.srcdir = options.srcdir;\n\n    const logoSvg = [\n      '<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 841.9 595.3\">',\n      '    <g fill=\"#61DAFB\">',\n      '        <path d=\"M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z\"/>',\n      '        <circle cx=\"420.9\" cy=\"296.5\" r=\"45.7\"/>',\n      '        <path d=\"M520.5 78.1z\"/>',\n      \"    </g>\",\n      \"</svg>\",\n      \"\",\n    ];\n\n    const appJsx = [\n      \"import logo from './logo.svg';\",\n      \"import './App.css'\",\n      \"\",\n      \"function App() {\",\n      \"  return (\",\n      '   <div className=\"App\">',\n      '      <header className=\"App-header\">',\n      '        <img src={logo} className=\"App-logo\" alt=\"logo\" />',\n      \"        <p>\",\n      `          Edit <code>src/App.${this.fileExt}</code> and save to reload.`,\n      \"        </p>\",\n      '        <a className=\"App-link\"',\n      '          href=\"https://reactjs.org\"',\n      '          target=\"_blank\"',\n      '          rel=\"noopener noreferrer\"',\n      \"        >\",\n      \"          Learn React\",\n      \"        </a>\",\n      \"      </header>\",\n      \"    </div>\",\n      \"  );\",\n      \"}\",\n      \"\",\n      \"export default App;\",\n      \"\",\n    ];\n\n    const appCss = [\n      \".App {\",\n      \"  text-align: center;\",\n      \"}\",\n      \"\",\n      \".App-logo {\",\n      \"  height: 40vmin;\",\n      \"  pointer-events: none;\",\n      \"}\",\n      \"\",\n      \"@media (prefers-reduced-motion: no-preference) {\",\n      \"  .App-logo {\",\n      \"    animation: App-logo-spin infinite 20s linear;\",\n      \"  }\",\n      \"}\",\n      \"\",\n      \".App-header {\",\n      \"  background-color: #282c34;\",\n      \"  min-height: 100vh;\",\n      \"  display: flex;\",\n      \"  flex-direction: column;\",\n      \"  align-items: center;\",\n      \"  justify-content: center;\",\n      \"  font-size: calc(10px + 2vmin);\",\n      \"  color: white;\",\n      \"}\",\n      \"\",\n      \".App-link {\",\n      \"  color: #61dafb;\",\n      \"}\",\n      \"\",\n      \"@keyframes App-logo-spin {\",\n      \"  from {\",\n      \"    transform: rotate(0deg);\",\n      \"  }\",\n      \"  to {\",\n      \"    transform: rotate(360deg);\",\n      \"  }\",\n      \"}\",\n      \"\",\n    ];\n\n    const appTestJsx = [\n      \"import { render, screen } from '@testing-library/react';\",\n      \"import App from './App';\",\n      \"\",\n      \"test('renders learn react link', () => {\",\n      \"  render(<App />);\",\n      \"  const linkElement = screen.getByText(/learn react/i);\",\n      \"  expect(linkElement).toBeInTheDocument();\",\n      \"});\",\n      \"\",\n    ];\n\n    const indexJsx = [\n      \"import React from 'react';\",\n      \"import ReactDOM from 'react-dom';\",\n      \"import './index.css';\",\n      \"import App from './App';\",\n      \"import reportWebVitals from './reportWebVitals';\",\n      \"\",\n      \"ReactDOM.render(\",\n      \"  <React.StrictMode>\",\n      \"    <App />\",\n      \"  </React.StrictMode>,\",\n      \"  document.getElementById('root')\",\n      \");\",\n      \"\",\n      \"// If you want to start measuring performance in your app, pass a function\",\n      \"// to log results (for example: reportWebVitals(console.log))\",\n      \"// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals\",\n      \"reportWebVitals();\",\n      \"\",\n    ];\n\n    const indexCss = [\n      \"body {\",\n      \"  margin: 0;\",\n      \"  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',\",\n      \"    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',\",\n      \"    sans-serif;\",\n      \"  -webkit-font-smoothing: antialiased;\",\n      \"  -moz-osx-font-smoothing: grayscale;\",\n      \"}\",\n      \"\",\n      \"code {\",\n      \"  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',\",\n      \"    monospace;\",\n      \"}\",\n      \"\",\n    ];\n\n    const reportWebVitalsJs = [\n      \"import { ReportHandler } from 'web-vitals';\",\n      \"\",\n      \"const reportWebVitals = (onPerfEntry?: ReportHandler) => {\",\n      \"  if (onPerfEntry && onPerfEntry instanceof Function) {\",\n      \"    import('web-vitals').then(\",\n      \"      ({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {\",\n      \"        getCLS(onPerfEntry);\",\n      \"        getFID(onPerfEntry);\",\n      \"        getFCP(onPerfEntry);\",\n      \"        getLCP(onPerfEntry);\",\n      \"        getTTFB(onPerfEntry);\",\n      \"      },\",\n      \"      () => {}\",\n      \"    );\",\n      \"  }\",\n      \"};\",\n      \"\",\n      \"export default reportWebVitals;\",\n    ];\n\n    const setupTestsJs = [\n      \"// jest-dom adds custom jest matchers for asserting on DOM nodes.\",\n      \"// allows you to do things like:\",\n      \"// expect(element).toHaveTextContent(/react/i)\",\n      \"// learn more: https://github.com/testing-library/jest-dom\",\n      \"import '@testing-library/jest-dom';\",\n      \"\",\n    ];\n\n    const reactTypeDef = ['/// <reference types=\"react-scripts\" />'];\n\n    // js/ts not jsx/tsx\n    const fileExtWithoutX = this.fileExt.replace(\"x\", \"\");\n\n    new SampleDir(project, this.srcdir, {\n      files: {\n        \"react-app-env.d.ts\": reactTypeDef.join(\"\\n\"),\n        \"logo.svg\": logoSvg.join(\"\\n\"),\n        [\"App.\" + this.fileExt]: appJsx.join(\"\\n\"),\n        [\"App.test.\" + this.fileExt]: appTestJsx.join(\"\\n\"),\n        \"App.css\": appCss.join(\"\\n\"),\n        [\"index.\" + this.fileExt]: indexJsx.join(\"\\n\"),\n        \"index.css\": indexCss.join(\"\\n\"),\n        [\"reportWebVitals.\" + fileExtWithoutX]: reportWebVitalsJs.join(\"\\n\"),\n        [\"setupTests.\" + fileExtWithoutX]: setupTestsJs.join(\"\\n\"),\n      },\n    });\n  }\n}\n\n/**\n * @deprecated No longer used.\n */\nexport interface ReactTypeDefOptions extends FileBaseOptions {}\n\n/**\n * @deprecated No longer used.\n */\nexport class ReactTypeDef extends FileBase {\n  constructor(\n    project: ReactTypeScriptProject,\n    filePath: string,\n    options: ReactTypeDefOptions = {}\n  ) {\n    super(project, filePath, options);\n  }\n\n  protected synthesizeContent(_: IResolver): string | undefined {\n    return ['/// <reference types=\"react-scripts\" />'].join(\"\\n\");\n  }\n}\n"]}
|
package/lib/web/tailwind.js
CHANGED
|
@@ -33,5 +33,5 @@ class TailwindConfig {
|
|
|
33
33
|
}
|
|
34
34
|
exports.TailwindConfig = TailwindConfig;
|
|
35
35
|
_a = JSII_RTTI_SYMBOL_1;
|
|
36
|
-
TailwindConfig[_a] = { fqn: "projen.web.TailwindConfig", version: "0.92.
|
|
36
|
+
TailwindConfig[_a] = { fqn: "projen.web.TailwindConfig", version: "0.92.5" };
|
|
37
37
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFpbHdpbmQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2ViL3RhaWx3aW5kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQ0Esa0NBQW1DO0FBU25DOzs7Ozs7O0dBT0c7QUFDSCxNQUFhLGNBQWM7SUFJekIsWUFBWSxPQUFvQixFQUFFLE9BQStCO1FBQy9ELElBQUksQ0FBQyxRQUFRLEdBQUcsT0FBTyxFQUFFLFFBQVEsSUFBSSxzQkFBc0IsQ0FBQztRQUU1RCxJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksZUFBUSxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsUUFBUSxFQUFFO1lBQy9DLEdBQUcsRUFBRTtnQkFDSCxPQUFPLEVBQUUsRUFBRTtnQkFDWCxLQUFLLEVBQUUsS0FBSztnQkFDWixLQUFLLEVBQUU7b0JBQ0wsTUFBTSxFQUFFLEVBQUU7aUJBQ1g7Z0JBQ0QsUUFBUSxFQUFFO29CQUNSLE1BQU0sRUFBRSxFQUFFO2lCQUNYO2dCQUNELE9BQU8sRUFBRSxFQUFFO2FBQ1o7U0FDRixDQUFDLENBQUM7UUFFSCxPQUFPLENBQUMsU0FBUyxFQUFFLE9BQU8sQ0FBQyxJQUFJLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO0lBQ2xELENBQUM7O0FBdEJILHdDQXVCQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE5vZGVQcm9qZWN0IH0gZnJvbSBcIi4uL2phdmFzY3JpcHRcIjtcbmltcG9ydCB7IEpzb25GaWxlIH0gZnJvbSBcIi4uL2pzb25cIjtcblxuZXhwb3J0IGludGVyZmFjZSBUYWlsd2luZENvbmZpZ09wdGlvbnMge1xuICAvKipcbiAgICogQGRlZmF1bHQgXCJ0YWlsd2luZC5jb25maWcuanNvblwiXG4gICAqL1xuICByZWFkb25seSBmaWxlTmFtZT86IHN0cmluZztcbn1cblxuLyoqXG4gKiBEZWNsYXJlcyBhIFRhaWx3aW5kIENTUyBjb25maWd1cmF0aW9uIGZpbGUuXG4gKlxuICogVGhlcmUgYXJlIG11bHRpcGxlIHdheXMgdG8gYWRkIFRhaWx3aW5kIENTUyBpbiB5b3VyIG5vZGUgcHJvamVjdCAtIHNlZTpcbiAqIGh0dHBzOi8vdGFpbHdpbmRjc3MuY29tL2RvY3MvaW5zdGFsbGF0aW9uXG4gKlxuICogQHNlZSBQb3N0Q3NzXG4gKi9cbmV4cG9ydCBjbGFzcyBUYWlsd2luZENvbmZpZyB7XG4gIHB1YmxpYyByZWFkb25seSBmaWxlTmFtZTogc3RyaW5nO1xuICBwdWJsaWMgcmVhZG9ubHkgZmlsZTogSnNvbkZpbGU7XG5cbiAgY29uc3RydWN0b3IocHJvamVjdDogTm9kZVByb2plY3QsIG9wdGlvbnM/OiBUYWlsd2luZENvbmZpZ09wdGlvbnMpIHtcbiAgICB0aGlzLmZpbGVOYW1lID0gb3B0aW9ucz8uZmlsZU5hbWUgPz8gXCJ0YWlsd2luZC5jb25maWcuanNvblwiO1xuXG4gICAgdGhpcy5maWxlID0gbmV3IEpzb25GaWxlKHByb2plY3QsIHRoaXMuZmlsZU5hbWUsIHtcbiAgICAgIG9iajoge1xuICAgICAgICBjb250ZW50OiBbXSxcbiAgICAgICAgbWVkaWE6IGZhbHNlLFxuICAgICAgICB0aGVtZToge1xuICAgICAgICAgIGV4dGVuZDoge30sXG4gICAgICAgIH0sXG4gICAgICAgIHZhcmlhbnRzOiB7XG4gICAgICAgICAgZXh0ZW5kOiB7fSxcbiAgICAgICAgfSxcbiAgICAgICAgcGx1Z2luczogW10sXG4gICAgICB9LFxuICAgIH0pO1xuXG4gICAgcHJvamVjdC5ucG1pZ25vcmU/LmV4Y2x1ZGUoYC8ke3RoaXMuZmlsZU5hbWV9YCk7XG4gIH1cbn1cbiJdfQ==
|
package/lib/xmlfile.js
CHANGED
|
@@ -32,5 +32,5 @@ class XmlFile extends object_file_1.ObjectFile {
|
|
|
32
32
|
}
|
|
33
33
|
exports.XmlFile = XmlFile;
|
|
34
34
|
_a = JSII_RTTI_SYMBOL_1;
|
|
35
|
-
XmlFile[_a] = { fqn: "projen.XmlFile", version: "0.92.
|
|
35
|
+
XmlFile[_a] = { fqn: "projen.XmlFile", version: "0.92.5" };
|
|
36
36
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoieG1sZmlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy94bWxmaWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsNkNBQWtEO0FBRWxELCtDQUE4RDtBQVE5RDs7Ozs7R0FLRztBQUNILE1BQWEsT0FBUSxTQUFRLHdCQUFVO0lBQ3JDLFlBQ0UsT0FBZ0IsRUFDaEIsUUFBZ0IsRUFDaEIsVUFBMEIsRUFBRTtRQUU1QixLQUFLLENBQUMsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLENBQUMsQ0FBQztJQUNwQyxDQUFDO0lBRVMsaUJBQWlCLENBQUMsUUFBbUI7UUFDN0MsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLGlCQUFpQixDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQzlDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUNULE9BQU8sU0FBUyxDQUFDO1FBQ25CLENBQUM7UUFFRCxNQUFNLFNBQVMsR0FBRyxJQUFBLG9CQUFTLEVBQUMsRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLEVBQUUsR0FBRyxDQUFDLENBQUMsR0FBRyxDQUFDO1lBQzFELFdBQVcsRUFBRSxJQUFJO1lBQ2pCLE1BQU0sRUFBRSxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztTQUN0QixDQUFDLENBQUM7UUFFSCxPQUFPO1lBQ0wsU0FBUztZQUNULEdBQUcsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsSUFBSSxDQUFDLE1BQU0sTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztTQUNwRCxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNmLENBQUM7O0FBeEJILDBCQXlCQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGNyZWF0ZSBhcyBjcmVhdGV4bWwgfSBmcm9tIFwieG1sYnVpbGRlcjJcIjtcbmltcG9ydCB7IElSZXNvbHZlciB9IGZyb20gXCIuL2ZpbGVcIjtcbmltcG9ydCB7IE9iamVjdEZpbGUsIE9iamVjdEZpbGVPcHRpb25zIH0gZnJvbSBcIi4vb2JqZWN0LWZpbGVcIjtcbmltcG9ydCB7IFByb2plY3QgfSBmcm9tIFwiLi9wcm9qZWN0XCI7XG5cbi8qKlxuICogT3B0aW9ucyBmb3IgYFhtbEZpbGVgLlxuICovXG5leHBvcnQgaW50ZXJmYWNlIFhtbEZpbGVPcHRpb25zIGV4dGVuZHMgT2JqZWN0RmlsZU9wdGlvbnMge31cblxuLyoqXG4gKiBSZXByZXNlbnRzIGFuIFhNTCBmaWxlLlxuICpcbiAqIE9iamVjdHMgcGFzc2VkIGluIHdpbGwgYmUgc3ludGhlc2l6ZWQgdXNpbmcgdGhlIG5wbSBcInhtbFwiIGxpYnJhcnkuXG4gKiBAc2VlIGh0dHBzOi8vd3d3Lm5wbWpzLmNvbS9wYWNrYWdlL3htbFxuICovXG5leHBvcnQgY2xhc3MgWG1sRmlsZSBleHRlbmRzIE9iamVjdEZpbGUge1xuICBjb25zdHJ1Y3RvcihcbiAgICBwcm9qZWN0OiBQcm9qZWN0LFxuICAgIGZpbGVQYXRoOiBzdHJpbmcsXG4gICAgb3B0aW9uczogWG1sRmlsZU9wdGlvbnMgPSB7fVxuICApIHtcbiAgICBzdXBlcihwcm9qZWN0LCBmaWxlUGF0aCwgb3B0aW9ucyk7XG4gIH1cblxuICBwcm90ZWN0ZWQgc3ludGhlc2l6ZUNvbnRlbnQocmVzb2x2ZXI6IElSZXNvbHZlcik6IHN0cmluZyB8IHVuZGVmaW5lZCB7XG4gICAgY29uc3Qgb2JqID0gc3VwZXIuc3ludGhlc2l6ZUNvbnRlbnQocmVzb2x2ZXIpO1xuICAgIGlmICghb2JqKSB7XG4gICAgICByZXR1cm4gdW5kZWZpbmVkO1xuICAgIH1cblxuICAgIGNvbnN0IHhtbFN0cmluZyA9IGNyZWF0ZXhtbCh7IGVuY29kaW5nOiBcIlVURi04XCIgfSwgb2JqKS5lbmQoe1xuICAgICAgcHJldHR5UHJpbnQ6IHRydWUsXG4gICAgICBpbmRlbnQ6IFwiIFwiLnJlcGVhdCg0KSxcbiAgICB9KTtcblxuICAgIHJldHVybiBbXG4gICAgICB4bWxTdHJpbmcsXG4gICAgICAuLi4odGhpcy5tYXJrZXIgPyBbYDwhLS0gJHt0aGlzLm1hcmtlcn0gLS0+YF0gOiBbXSksXG4gICAgXS5qb2luKFwiXFxuXCIpO1xuICB9XG59XG4iXX0=
|
package/lib/yaml.js
CHANGED
|
@@ -30,5 +30,5 @@ class YamlFile extends object_file_1.ObjectFile {
|
|
|
30
30
|
}
|
|
31
31
|
exports.YamlFile = YamlFile;
|
|
32
32
|
_a = JSII_RTTI_SYMBOL_1;
|
|
33
|
-
YamlFile[_a] = { fqn: "projen.YamlFile", version: "0.92.
|
|
33
|
+
YamlFile[_a] = { fqn: "projen.YamlFile", version: "0.92.5" };
|
|
34
34
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoieWFtbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy95YW1sLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQ0EsNkJBQTZCO0FBRTdCLCtDQUE4RDtBQWM5RDs7R0FFRztBQUNILE1BQWEsUUFBUyxTQUFRLHdCQUFVO0lBTXRDLFlBQVksS0FBaUIsRUFBRSxRQUFnQixFQUFFLE9BQXdCO1FBQ3ZFLEtBQUssQ0FBQyxLQUFLLEVBQUUsUUFBUSxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQ2hDLElBQUksQ0FBQyxTQUFTLEdBQUcsT0FBTyxDQUFDLFNBQVMsSUFBSSxDQUFDLENBQUM7SUFDMUMsQ0FBQztJQUVTLGlCQUFpQixDQUFDLFFBQW1CO1FBQzdDLE1BQU0sSUFBSSxHQUFHLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUMvQyxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDVixPQUFPLFNBQVMsQ0FBQztRQUNuQixDQUFDO1FBRUQsT0FBTztZQUNMLEdBQUcsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztZQUM1QyxFQUFFO1lBQ0YsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxFQUFFO2dCQUMvQixNQUFNLEVBQUUsQ0FBQztnQkFDVCxTQUFTLEVBQUUsSUFBSSxDQUFDLFNBQVM7YUFDMUIsQ0FBQztTQUNILENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2YsQ0FBQzs7QUF6QkgsNEJBMEJDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSUNvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5pbXBvcnQgKiBhcyBZQU1MIGZyb20gXCJ5YW1sXCI7XG5pbXBvcnQgeyBJUmVzb2x2ZXIgfSBmcm9tIFwiLi9maWxlXCI7XG5pbXBvcnQgeyBPYmplY3RGaWxlLCBPYmplY3RGaWxlT3B0aW9ucyB9IGZyb20gXCIuL29iamVjdC1maWxlXCI7XG5cbi8qKlxuICogT3B0aW9ucyBmb3IgYEpzb25GaWxlYC5cbiAqL1xuZXhwb3J0IGludGVyZmFjZSBZYW1sRmlsZU9wdGlvbnMgZXh0ZW5kcyBPYmplY3RGaWxlT3B0aW9ucyB7XG4gIC8qKlxuICAgKiBNYXhpbXVtIGxpbmUgd2lkdGggKHNldCB0byAwIHRvIGRpc2FibGUgZm9sZGluZykuXG4gICAqXG4gICAqIEBkZWZhdWx0IC0gMFxuICAgKi9cbiAgcmVhZG9ubHkgbGluZVdpZHRoPzogbnVtYmVyO1xufVxuXG4vKipcbiAqIFJlcHJlc2VudHMgYSBZQU1MIGZpbGUuXG4gKi9cbmV4cG9ydCBjbGFzcyBZYW1sRmlsZSBleHRlbmRzIE9iamVjdEZpbGUge1xuICAvKipcbiAgICogTWF4aW11bSBsaW5lIHdpZHRoIChzZXQgdG8gMCB0byBkaXNhYmxlIGZvbGRpbmcpLlxuICAgKi9cbiAgcHVibGljIGxpbmVXaWR0aDogbnVtYmVyO1xuXG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBJQ29uc3RydWN0LCBmaWxlUGF0aDogc3RyaW5nLCBvcHRpb25zOiBZYW1sRmlsZU9wdGlvbnMpIHtcbiAgICBzdXBlcihzY29wZSwgZmlsZVBhdGgsIG9wdGlvbnMpO1xuICAgIHRoaXMubGluZVdpZHRoID0gb3B0aW9ucy5saW5lV2lkdGggPz8gMDtcbiAgfVxuXG4gIHByb3RlY3RlZCBzeW50aGVzaXplQ29udGVudChyZXNvbHZlcjogSVJlc29sdmVyKTogc3RyaW5nIHwgdW5kZWZpbmVkIHtcbiAgICBjb25zdCBqc29uID0gc3VwZXIuc3ludGhlc2l6ZUNvbnRlbnQocmVzb2x2ZXIpO1xuICAgIGlmICghanNvbikge1xuICAgICAgcmV0dXJuIHVuZGVmaW5lZDtcbiAgICB9XG5cbiAgICByZXR1cm4gW1xuICAgICAgLi4uKHRoaXMubWFya2VyID8gW2AjICR7dGhpcy5tYXJrZXJ9YF0gOiBbXSksXG4gICAgICBcIlwiLFxuICAgICAgWUFNTC5zdHJpbmdpZnkoSlNPTi5wYXJzZShqc29uKSwge1xuICAgICAgICBpbmRlbnQ6IDIsXG4gICAgICAgIGxpbmVXaWR0aDogdGhpcy5saW5lV2lkdGgsXG4gICAgICB9KSxcbiAgICBdLmpvaW4oXCJcXG5cIik7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -72,8 +72,7 @@ function resolveProps(tokens, { flow, indicator, next, offset, onError, parentIn
|
|
|
72
72
|
if (token.source.endsWith(':'))
|
|
73
73
|
onError(token.offset + token.source.length - 1, 'BAD_ALIAS', 'Anchor ending in : is ambiguous', true);
|
|
74
74
|
anchor = token;
|
|
75
|
-
|
|
76
|
-
start = token.offset;
|
|
75
|
+
start ?? (start = token.offset);
|
|
77
76
|
atNewline = false;
|
|
78
77
|
hasSpace = false;
|
|
79
78
|
reqSpace = true;
|
|
@@ -82,8 +81,7 @@ function resolveProps(tokens, { flow, indicator, next, offset, onError, parentIn
|
|
|
82
81
|
if (tag)
|
|
83
82
|
onError(token, 'MULTIPLE_TAGS', 'A node can have at most one tag');
|
|
84
83
|
tag = token;
|
|
85
|
-
|
|
86
|
-
start = token.offset;
|
|
84
|
+
start ?? (start = token.offset);
|
|
87
85
|
atNewline = false;
|
|
88
86
|
hasSpace = false;
|
|
89
87
|
reqSpace = true;
|
|
@@ -39,8 +39,7 @@ function createNodeAnchors(doc, prefix) {
|
|
|
39
39
|
return {
|
|
40
40
|
onAnchor: (source) => {
|
|
41
41
|
aliasObjects.push(source);
|
|
42
|
-
|
|
43
|
-
prevAnchors = anchorNames(doc);
|
|
42
|
+
prevAnchors ?? (prevAnchors = anchorNames(doc));
|
|
44
43
|
const anchor = findNewAnchor(prefix, prevAnchors);
|
|
45
44
|
prevAnchors.add(anchor);
|
|
46
45
|
return anchor;
|
|
@@ -38,8 +38,7 @@ function createNode(value, tagName, ctx) {
|
|
|
38
38
|
if (aliasDuplicateObjects && value && typeof value === 'object') {
|
|
39
39
|
ref = sourceObjects.get(value);
|
|
40
40
|
if (ref) {
|
|
41
|
-
|
|
42
|
-
ref.anchor = onAnchor(value);
|
|
41
|
+
ref.anchor ?? (ref.anchor = onAnchor(value));
|
|
43
42
|
return new Alias(ref.anchor);
|
|
44
43
|
}
|
|
45
44
|
else {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { anchorIsValid } from '../doc/anchors.js';
|
|
2
2
|
import { visit } from '../visit.js';
|
|
3
|
-
import { ALIAS, isAlias, isCollection, isPair } from './identity.js';
|
|
3
|
+
import { ALIAS, isAlias, isCollection, isPair, hasAnchor } from './identity.js';
|
|
4
4
|
import { NodeBase } from './Node.js';
|
|
5
5
|
import { toJS } from './toJS.js';
|
|
6
6
|
|
|
@@ -18,23 +18,36 @@ class Alias extends NodeBase {
|
|
|
18
18
|
* Resolve the value of this alias within `doc`, finding the last
|
|
19
19
|
* instance of the `source` anchor before this node.
|
|
20
20
|
*/
|
|
21
|
-
resolve(doc) {
|
|
21
|
+
resolve(doc, ctx) {
|
|
22
|
+
let nodes;
|
|
23
|
+
if (ctx?.aliasResolveCache) {
|
|
24
|
+
nodes = ctx.aliasResolveCache;
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
nodes = [];
|
|
28
|
+
visit(doc, {
|
|
29
|
+
Node: (_key, node) => {
|
|
30
|
+
if (isAlias(node) || hasAnchor(node))
|
|
31
|
+
nodes.push(node);
|
|
32
|
+
}
|
|
33
|
+
});
|
|
34
|
+
if (ctx)
|
|
35
|
+
ctx.aliasResolveCache = nodes;
|
|
36
|
+
}
|
|
22
37
|
let found = undefined;
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
}
|
|
30
|
-
});
|
|
38
|
+
for (const node of nodes) {
|
|
39
|
+
if (node === this)
|
|
40
|
+
break;
|
|
41
|
+
if (node.anchor === this.source)
|
|
42
|
+
found = node;
|
|
43
|
+
}
|
|
31
44
|
return found;
|
|
32
45
|
}
|
|
33
46
|
toJSON(_arg, ctx) {
|
|
34
47
|
if (!ctx)
|
|
35
48
|
return { source: this.source };
|
|
36
49
|
const { anchors, doc, maxAliasCount } = ctx;
|
|
37
|
-
const source = this.resolve(doc);
|
|
50
|
+
const source = this.resolve(doc, ctx);
|
|
38
51
|
if (!source) {
|
|
39
52
|
const msg = `Unresolved alias (the anchor must be set before the alias): ${this.source}`;
|
|
40
53
|
throw new ReferenceError(msg);
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { stringifyCollection } from '../stringify/stringifyCollection.js';
|
|
2
2
|
import { addPairToJSMap } from './addPairToJSMap.js';
|
|
3
3
|
import { Collection } from './Collection.js';
|
|
4
|
-
import { isPair, isScalar
|
|
4
|
+
import { MAP, isPair, isScalar } from './identity.js';
|
|
5
5
|
import { Pair, createPair } from './Pair.js';
|
|
6
6
|
import { isScalarValue } from './Scalar.js';
|
|
7
7
|
|
|
@@ -37,6 +37,7 @@ function addPairToJSMap(ctx, map, { key, value }) {
|
|
|
37
37
|
function stringifyKey(key, jsKey, ctx) {
|
|
38
38
|
if (jsKey === null)
|
|
39
39
|
return '';
|
|
40
|
+
// eslint-disable-next-line @typescript-eslint/no-base-to-string
|
|
40
41
|
if (typeof jsKey !== 'object')
|
|
41
42
|
return String(jsKey);
|
|
42
43
|
if (isNode(key) && ctx?.doc) {
|
|
@@ -3,8 +3,8 @@ import { nullTag } from './common/null.js';
|
|
|
3
3
|
import { seq } from './common/seq.js';
|
|
4
4
|
import { string } from './common/string.js';
|
|
5
5
|
import { boolTag } from './core/bool.js';
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
6
|
+
import { floatNaN, floatExp, float } from './core/float.js';
|
|
7
|
+
import { intOct, intHex, int } from './core/int.js';
|
|
8
8
|
import { schema } from './core/schema.js';
|
|
9
9
|
import { schema as schema$1 } from './json/schema.js';
|
|
10
10
|
import { binary } from './yaml-1.1/binary.js';
|
|
@@ -13,7 +13,7 @@ import { omap } from './yaml-1.1/omap.js';
|
|
|
13
13
|
import { pairs } from './yaml-1.1/pairs.js';
|
|
14
14
|
import { schema as schema$2 } from './yaml-1.1/schema.js';
|
|
15
15
|
import { set } from './yaml-1.1/set.js';
|
|
16
|
-
import { timestamp,
|
|
16
|
+
import { timestamp, intTime, floatTime } from './yaml-1.1/timestamp.js';
|
|
17
17
|
|
|
18
18
|
const schemas = new Map([
|
|
19
19
|
['core', schema],
|
|
@@ -41,8 +41,7 @@ const binary = {
|
|
|
41
41
|
else {
|
|
42
42
|
throw new Error('This environment does not support writing binary tags; either Buffer or btoa is required');
|
|
43
43
|
}
|
|
44
|
-
|
|
45
|
-
type = Scalar.BLOCK_LITERAL;
|
|
44
|
+
type ?? (type = Scalar.BLOCK_LITERAL);
|
|
46
45
|
if (type !== Scalar.QUOTE_DOUBLE) {
|
|
47
46
|
const lineWidth = Math.max(ctx.options.lineWidth - ctx.indent.length, ctx.options.minContentWidth);
|
|
48
47
|
const n = Math.ceil(str.length / lineWidth);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { isSeq, isPair, isMap } from '../../nodes/identity.js';
|
|
2
|
-
import {
|
|
2
|
+
import { createPair, Pair } from '../../nodes/Pair.js';
|
|
3
3
|
import { Scalar } from '../../nodes/Scalar.js';
|
|
4
4
|
import { YAMLSeq } from '../../nodes/YAMLSeq.js';
|
|
5
5
|
|
|
@@ -68,7 +68,7 @@ function getTagObject(tags, item) {
|
|
|
68
68
|
tagObj = tags.find(t => t.nodeClass && obj instanceof t.nodeClass);
|
|
69
69
|
}
|
|
70
70
|
if (!tagObj) {
|
|
71
|
-
const name = obj?.constructor?.name ?? typeof obj;
|
|
71
|
+
const name = obj?.constructor?.name ?? (obj === null ? 'null' : typeof obj);
|
|
72
72
|
throw new Error(`Tag not resolved for ${name} value`);
|
|
73
73
|
}
|
|
74
74
|
return tagObj;
|
|
@@ -83,7 +83,7 @@ function stringifyProps(node, tagObj, { anchors, doc }) {
|
|
|
83
83
|
anchors.add(anchor);
|
|
84
84
|
props.push(`&${anchor}`);
|
|
85
85
|
}
|
|
86
|
-
const tag = node.tag
|
|
86
|
+
const tag = node.tag ?? (tagObj.default ? null : tagObj.tag);
|
|
87
87
|
if (tag)
|
|
88
88
|
props.push(doc.directives.tagString(tag));
|
|
89
89
|
return props.join(' ');
|
|
@@ -109,8 +109,7 @@ function stringify(item, ctx, onComment, onChompKeep) {
|
|
|
109
109
|
const node = isNode(item)
|
|
110
110
|
? item
|
|
111
111
|
: ctx.doc.createNode(item, { onTagObj: o => (tagObj = o) });
|
|
112
|
-
|
|
113
|
-
tagObj = getTagObject(ctx.doc.schema.tags, node);
|
|
112
|
+
tagObj ?? (tagObj = getTagObject(ctx.doc.schema.tags, node));
|
|
114
113
|
const props = stringifyProps(node, tagObj, ctx);
|
|
115
114
|
if (props.length > 0)
|
|
116
115
|
ctx.indentAtStart = (ctx.indentAtStart ?? 0) + props.length + 1;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Scalar } from '../nodes/Scalar.js';
|
|
2
|
-
import { foldFlowLines,
|
|
2
|
+
import { foldFlowLines, FOLD_FLOW, FOLD_QUOTED, FOLD_BLOCK } from './foldFlowLines.js';
|
|
3
3
|
|
|
4
4
|
const getFoldOptions = (ctx, isBlock) => ({
|
|
5
5
|
indentAtStart: isBlock ? ctx.indent.length : ctx.indentAtStart,
|
|
@@ -253,10 +253,9 @@ function plainString(item, ctx, onComment, onChompKeep) {
|
|
|
253
253
|
(inFlow && /[[\]{},]/.test(value))) {
|
|
254
254
|
return quotedString(value, ctx);
|
|
255
255
|
}
|
|
256
|
-
if (
|
|
257
|
-
/^[\n\t ,[\]{}#&*!|>'"%@`]|^[?-]$|^[?-][ \t]|[\n:][ \t]|[ \t]\n|[\n\t ]#|[\n\t :]$/.test(value)) {
|
|
256
|
+
if (/^[\n\t ,[\]{}#&*!|>'"%@`]|^[?-]$|^[?-][ \t]|[\n:][ \t]|[ \t]\n|[\n\t ]#|[\n\t :]$/.test(value)) {
|
|
258
257
|
// not allowed:
|
|
259
|
-
// -
|
|
258
|
+
// - '-' or '?'
|
|
260
259
|
// - start with an indicator character (except [?:-]) or /[?-] /
|
|
261
260
|
// - '\n ', ': ' or ' \n' anywhere
|
|
262
261
|
// - '#' not preceded by a non-space char
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export declare const help = "yaml: A command-line YAML processor and inspector\n\nReads stdin and writes output to stdout and errors & warnings to stderr.\n\nUsage:\n yaml Process a YAML stream, outputting it as YAML\n yaml cst Parse the CST of a YAML stream\n yaml lex Parse the lexical tokens of a YAML stream\n yaml valid Validate a YAML stream, returning 0 on success\n\nOptions:\n --help, -h Show this message.\n --json, -j Output JSON.\n --indent 2 Output pretty-printed data, indented by the given number of spaces.\n\nAdditional options for bare \"yaml\" command:\n --doc, -d Output pretty-printed JS Document objects.\n --single, -1 Require the input to consist of a single YAML document.\n --strict, -s Stop on errors.\n --visit, -v Apply a visitor to each document (requires a path to import)\n --yaml 1.1 Set the YAML version. (default: 1.2)";
|
|
1
|
+
export declare const help = "yaml: A command-line YAML processor and inspector\n\nReads stdin and writes output to stdout and errors & warnings to stderr.\n\nUsage:\n yaml Process a YAML stream, outputting it as YAML\n yaml cst Parse the CST of a YAML stream\n yaml lex Parse the lexical tokens of a YAML stream\n yaml valid Validate a YAML stream, returning 0 on success\n\nOptions:\n --help, -h Show this message.\n --json, -j Output JSON.\n --indent 2 Output pretty-printed data, indented by the given number of spaces.\n --merge, -m Enable support for \"<<\" merge keys.\n\nAdditional options for bare \"yaml\" command:\n --doc, -d Output pretty-printed JS Document objects.\n --single, -1 Require the input to consist of a single YAML document.\n --strict, -s Stop on errors.\n --visit, -v Apply a visitor to each document (requires a path to import)\n --yaml 1.1 Set the YAML version. (default: 1.2)";
|
|
2
2
|
export declare class UserError extends Error {
|
|
3
3
|
static ARGS: number;
|
|
4
4
|
static SINGLE: number;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { resolve } from '
|
|
2
|
-
import { parseArgs } from '
|
|
1
|
+
import { resolve } from 'path';
|
|
2
|
+
import { parseArgs } from 'util';
|
|
3
3
|
import { prettyToken } from './parse/cst.js';
|
|
4
4
|
import { Lexer } from './parse/lexer.js';
|
|
5
5
|
import { Parser } from './parse/parser.js';
|
|
@@ -23,6 +23,7 @@ Options:
|
|
|
23
23
|
--help, -h Show this message.
|
|
24
24
|
--json, -j Output JSON.
|
|
25
25
|
--indent 2 Output pretty-printed data, indented by the given number of spaces.
|
|
26
|
+
--merge, -m Enable support for "<<" merge keys.
|
|
26
27
|
|
|
27
28
|
Additional options for bare "yaml" command:
|
|
28
29
|
--doc, -d Output pretty-printed JS Document objects.
|
|
@@ -48,6 +49,7 @@ async function cli(stdin, done, argv) {
|
|
|
48
49
|
doc: { type: 'boolean', short: 'd' },
|
|
49
50
|
help: { type: 'boolean', short: 'h' },
|
|
50
51
|
indent: { type: 'string', short: 'i' },
|
|
52
|
+
merge: { type: 'boolean', short: 'm' },
|
|
51
53
|
json: { type: 'boolean', short: 'j' },
|
|
52
54
|
single: { type: 'boolean', short: '1' },
|
|
53
55
|
strict: { type: 'boolean', short: 's' },
|
|
@@ -117,7 +119,7 @@ async function cli(stdin, done, argv) {
|
|
|
117
119
|
const lineCounter = new LineCounter();
|
|
118
120
|
const parser = new Parser(lineCounter.addNewLine);
|
|
119
121
|
// @ts-expect-error Version is validated at runtime
|
|
120
|
-
const composer = new Composer({ version: opt.yaml });
|
|
122
|
+
const composer = new Composer({ version: opt.yaml, merge: opt.merge });
|
|
121
123
|
const visitor = opt.visit
|
|
122
124
|
? (await import(resolve(opt.visit))).default
|
|
123
125
|
: null;
|
|
@@ -74,8 +74,7 @@ function resolveProps(tokens, { flow, indicator, next, offset, onError, parentIn
|
|
|
74
74
|
if (token.source.endsWith(':'))
|
|
75
75
|
onError(token.offset + token.source.length - 1, 'BAD_ALIAS', 'Anchor ending in : is ambiguous', true);
|
|
76
76
|
anchor = token;
|
|
77
|
-
|
|
78
|
-
start = token.offset;
|
|
77
|
+
start ?? (start = token.offset);
|
|
79
78
|
atNewline = false;
|
|
80
79
|
hasSpace = false;
|
|
81
80
|
reqSpace = true;
|
|
@@ -84,8 +83,7 @@ function resolveProps(tokens, { flow, indicator, next, offset, onError, parentIn
|
|
|
84
83
|
if (tag)
|
|
85
84
|
onError(token, 'MULTIPLE_TAGS', 'A node can have at most one tag');
|
|
86
85
|
tag = token;
|
|
87
|
-
|
|
88
|
-
start = token.offset;
|
|
86
|
+
start ?? (start = token.offset);
|
|
89
87
|
atNewline = false;
|
|
90
88
|
hasSpace = false;
|
|
91
89
|
reqSpace = true;
|
|
@@ -41,8 +41,7 @@ function createNodeAnchors(doc, prefix) {
|
|
|
41
41
|
return {
|
|
42
42
|
onAnchor: (source) => {
|
|
43
43
|
aliasObjects.push(source);
|
|
44
|
-
|
|
45
|
-
prevAnchors = anchorNames(doc);
|
|
44
|
+
prevAnchors ?? (prevAnchors = anchorNames(doc));
|
|
46
45
|
const anchor = findNewAnchor(prefix, prevAnchors);
|
|
47
46
|
prevAnchors.add(anchor);
|
|
48
47
|
return anchor;
|
|
@@ -40,8 +40,7 @@ function createNode(value, tagName, ctx) {
|
|
|
40
40
|
if (aliasDuplicateObjects && value && typeof value === 'object') {
|
|
41
41
|
ref = sourceObjects.get(value);
|
|
42
42
|
if (ref) {
|
|
43
|
-
|
|
44
|
-
ref.anchor = onAnchor(value);
|
|
43
|
+
ref.anchor ?? (ref.anchor = onAnchor(value));
|
|
45
44
|
return new Alias.Alias(ref.anchor);
|
|
46
45
|
}
|
|
47
46
|
else {
|
|
@@ -23,7 +23,7 @@ export declare class Alias extends NodeBase {
|
|
|
23
23
|
* Resolve the value of this alias within `doc`, finding the last
|
|
24
24
|
* instance of the `source` anchor before this node.
|
|
25
25
|
*/
|
|
26
|
-
resolve(doc: Document): Scalar | YAMLMap | YAMLSeq | undefined;
|
|
26
|
+
resolve(doc: Document, ctx?: ToJSContext): Scalar | YAMLMap | YAMLSeq | undefined;
|
|
27
27
|
toJSON(_arg?: unknown, ctx?: ToJSContext): unknown;
|
|
28
28
|
toString(ctx?: StringifyContext, _onComment?: () => void, _onChompKeep?: () => void): string;
|
|
29
29
|
}
|
|
@@ -20,23 +20,36 @@ class Alias extends Node.NodeBase {
|
|
|
20
20
|
* Resolve the value of this alias within `doc`, finding the last
|
|
21
21
|
* instance of the `source` anchor before this node.
|
|
22
22
|
*/
|
|
23
|
-
resolve(doc) {
|
|
23
|
+
resolve(doc, ctx) {
|
|
24
|
+
let nodes;
|
|
25
|
+
if (ctx?.aliasResolveCache) {
|
|
26
|
+
nodes = ctx.aliasResolveCache;
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
nodes = [];
|
|
30
|
+
visit.visit(doc, {
|
|
31
|
+
Node: (_key, node) => {
|
|
32
|
+
if (identity.isAlias(node) || identity.hasAnchor(node))
|
|
33
|
+
nodes.push(node);
|
|
34
|
+
}
|
|
35
|
+
});
|
|
36
|
+
if (ctx)
|
|
37
|
+
ctx.aliasResolveCache = nodes;
|
|
38
|
+
}
|
|
24
39
|
let found = undefined;
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
}
|
|
32
|
-
});
|
|
40
|
+
for (const node of nodes) {
|
|
41
|
+
if (node === this)
|
|
42
|
+
break;
|
|
43
|
+
if (node.anchor === this.source)
|
|
44
|
+
found = node;
|
|
45
|
+
}
|
|
33
46
|
return found;
|
|
34
47
|
}
|
|
35
48
|
toJSON(_arg, ctx) {
|
|
36
49
|
if (!ctx)
|
|
37
50
|
return { source: this.source };
|
|
38
51
|
const { anchors, doc, maxAliasCount } = ctx;
|
|
39
|
-
const source = this.resolve(doc);
|
|
52
|
+
const source = this.resolve(doc, ctx);
|
|
40
53
|
if (!source) {
|
|
41
54
|
const msg = `Unresolved alias (the anchor must be set before the alias): ${this.source}`;
|
|
42
55
|
throw new ReferenceError(msg);
|
|
@@ -39,6 +39,7 @@ function addPairToJSMap(ctx, map, { key, value }) {
|
|
|
39
39
|
function stringifyKey(key, jsKey, ctx) {
|
|
40
40
|
if (jsKey === null)
|
|
41
41
|
return '';
|
|
42
|
+
// eslint-disable-next-line @typescript-eslint/no-base-to-string
|
|
42
43
|
if (typeof jsKey !== 'object')
|
|
43
44
|
return String(jsKey);
|
|
44
45
|
if (identity.isNode(key) && ctx?.doc) {
|
|
@@ -7,6 +7,8 @@ export interface AnchorData {
|
|
|
7
7
|
}
|
|
8
8
|
export interface ToJSContext {
|
|
9
9
|
anchors: Map<Node, AnchorData>;
|
|
10
|
+
/** Cached anchor and alias nodes in the order they occur in the document */
|
|
11
|
+
aliasResolveCache?: Node[];
|
|
10
12
|
doc: Document<Node, boolean>;
|
|
11
13
|
keep: boolean;
|
|
12
14
|
mapAsMap: boolean;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var node_buffer = require('
|
|
3
|
+
var node_buffer = require('buffer');
|
|
4
4
|
var Scalar = require('../../nodes/Scalar.js');
|
|
5
5
|
var stringifyString = require('../../stringify/stringifyString.js');
|
|
6
6
|
|
|
@@ -53,8 +53,7 @@ const binary = {
|
|
|
53
53
|
else {
|
|
54
54
|
throw new Error('This environment does not support writing binary tags; either Buffer or btoa is required');
|
|
55
55
|
}
|
|
56
|
-
|
|
57
|
-
type = Scalar.Scalar.BLOCK_LITERAL;
|
|
56
|
+
type ?? (type = Scalar.Scalar.BLOCK_LITERAL);
|
|
58
57
|
if (type !== Scalar.Scalar.QUOTE_DOUBLE) {
|
|
59
58
|
const lineWidth = Math.max(ctx.options.lineWidth - ctx.indent.length, ctx.options.minContentWidth);
|
|
60
59
|
const n = Math.ceil(str.length / lineWidth);
|
|
@@ -70,7 +70,7 @@ function getTagObject(tags, item) {
|
|
|
70
70
|
tagObj = tags.find(t => t.nodeClass && obj instanceof t.nodeClass);
|
|
71
71
|
}
|
|
72
72
|
if (!tagObj) {
|
|
73
|
-
const name = obj?.constructor?.name ?? typeof obj;
|
|
73
|
+
const name = obj?.constructor?.name ?? (obj === null ? 'null' : typeof obj);
|
|
74
74
|
throw new Error(`Tag not resolved for ${name} value`);
|
|
75
75
|
}
|
|
76
76
|
return tagObj;
|
|
@@ -85,7 +85,7 @@ function stringifyProps(node, tagObj, { anchors: anchors$1, doc }) {
|
|
|
85
85
|
anchors$1.add(anchor);
|
|
86
86
|
props.push(`&${anchor}`);
|
|
87
87
|
}
|
|
88
|
-
const tag = node.tag
|
|
88
|
+
const tag = node.tag ?? (tagObj.default ? null : tagObj.tag);
|
|
89
89
|
if (tag)
|
|
90
90
|
props.push(doc.directives.tagString(tag));
|
|
91
91
|
return props.join(' ');
|
|
@@ -111,8 +111,7 @@ function stringify(item, ctx, onComment, onChompKeep) {
|
|
|
111
111
|
const node = identity.isNode(item)
|
|
112
112
|
? item
|
|
113
113
|
: ctx.doc.createNode(item, { onTagObj: o => (tagObj = o) });
|
|
114
|
-
|
|
115
|
-
tagObj = getTagObject(ctx.doc.schema.tags, node);
|
|
114
|
+
tagObj ?? (tagObj = getTagObject(ctx.doc.schema.tags, node));
|
|
116
115
|
const props = stringifyProps(node, tagObj, ctx);
|
|
117
116
|
if (props.length > 0)
|
|
118
117
|
ctx.indentAtStart = (ctx.indentAtStart ?? 0) + props.length + 1;
|