react-intl-lint 1.1.0 → 1.2.0

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/dist/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "author": "Raman Lauryniuk <romanrostislavovich@gmail.com>",
3
3
  "name": "react-intl-lint",
4
- "version": "1.1.0",
4
+ "version": "1.2.0",
5
5
  "description": "Simple tools for check `react-intl` keys in app",
6
6
  "license": "MIT",
7
7
  "repository": "svoboda-rabstvo/react-intl-lint",
@@ -77,10 +77,10 @@
77
77
  ]
78
78
  },
79
79
  "dependencies": {
80
- "chalk": "^5.6.2",
81
- "commander": "^14.0.1",
82
- "conventional-cli": "^1.2.0",
83
- "ngx-translate-lint": "^1.26.1"
80
+ "chalk": "^5.6.2",
81
+ "commander": "^14.0.1",
82
+ "conventional-cli": "^1.2.0",
83
+ "ngx-translate-lint": "^1.27.1"
84
84
  },
85
85
  "devDependencies": {
86
86
  "@types/chai": "^5.2.2",
@@ -49,10 +49,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
49
49
  exports.Cli = void 0;
50
50
  const commander_1 = __importStar(require("commander"));
51
51
  const core_1 = require("./../core");
52
+ const core_2 = require("./../core");
52
53
  const enums_1 = require("./enums");
53
54
  const chalk_1 = __importDefault(require("chalk"));
54
- const i18nextRegExp = __importStar(require("../react-intl/regex"));
55
- const node_path_1 = __importDefault(require("node:path"));
55
+ const path_1 = __importDefault(require("path"));
56
56
  const name = 'react-intl-lint';
57
57
  // tslint:disable-next-line:no-any
58
58
  const docs = {
@@ -63,10 +63,10 @@ const docs = {
63
63
 
64
64
  Examples:
65
65
 
66
- $ ${name} -p ${core_1.config.defaultValues.project} -l ${core_1.config.defaultValues.languages}
67
- $ ${name} -p ${core_1.config.defaultValues.project} -z ${core_1.ErrorTypes.disable} -v ${core_1.ErrorTypes.error}
68
- $ ${name} -p ${core_1.config.defaultValues.project} -i ./src/assets/i18n/EN-us.json, ./src/app/app.*.{json}
69
- $ ${name} -p ${core_1.config.defaultValues.project} -l https://8.8.8.8/locales/EN-eu.json
66
+ $ ${name} -p ${core_2.config.defaultValues.project} -l ${core_2.config.defaultValues.languages}
67
+ $ ${name} -p ${core_2.config.defaultValues.project} -z ${core_1.ErrorTypes.disable} -v ${core_1.ErrorTypes.error}
68
+ $ ${name} -p ${core_2.config.defaultValues.project} -i ./src/assets/i18n/EN-us.json, ./src/app/app.*.{json}
69
+ $ ${name} -p ${core_2.config.defaultValues.project} -l https://8.8.8.8/locales/EN-eu.json
70
70
 
71
71
  `
72
72
  };
@@ -89,8 +89,11 @@ class Cli {
89
89
  options.forEach((option) => {
90
90
  const optionFlag = option.getFlag();
91
91
  const optionDescription = option.getDescription();
92
- this.cliClient.addOption(new commander_1.Option(optionFlag, optionDescription));
92
+ const optionDefaultValue = option.default;
93
+ const commandOption = new commander_1.Option(optionFlag, optionDescription).default(optionDefaultValue);
94
+ this.cliClient.addOption(commandOption);
93
95
  });
96
+ this.cliClient.allowExcessArguments(true);
94
97
  // tslint:disable-next-line:no-any
95
98
  const packageJson = (0, core_1.parseJsonFile)((0, core_1.getPackageJsonPath)());
96
99
  this.cliClient.version(packageJson.version, '-v, --version', `Print current version of ${name}`);
@@ -109,8 +112,8 @@ class Cli {
109
112
  // Options
110
113
  const fileOptions = yield this.getConfig(this.cliClient.opts().config);
111
114
  const commandOptions = this.cliClient.opts();
112
- const defaultOptions = core_1.config.defaultValues;
113
- const resultOptions = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, defaultOptions), defaultOptions.rules), fileOptions), fileOptions.rules), commandOptions);
115
+ const defaultOptions = core_2.config.defaultValues;
116
+ const resultOptions = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, defaultOptions), defaultOptions === null || defaultOptions === void 0 ? void 0 : defaultOptions.rules), commandOptions), fileOptions), fileOptions === null || fileOptions === void 0 ? void 0 : fileOptions.rules);
114
117
  const projectPath = resultOptions.project;
115
118
  const languagePath = resultOptions.languages;
116
119
  const fixZombiesKeys = resultOptions.fixZombiesKeys;
@@ -155,12 +158,13 @@ class Cli {
155
158
  if (!configPath) {
156
159
  return {};
157
160
  }
158
- const extension = node_path_1.default.extname(configPath);
161
+ const extension = path_1.default.extname(configPath);
159
162
  if (extension === '.json') {
160
163
  return (0, core_1.parseJsonFile)(configPath);
161
164
  }
162
165
  if (extension === '.js') {
163
- const result = yield Promise.resolve(`${configPath}`).then(s => __importStar(require(s)));
166
+ const correctConfigPath = core_1.PathUtils.resolvePath(configPath);
167
+ const result = yield Promise.resolve(`${correctConfigPath}`).then(s => __importStar(require(s)));
164
168
  return result.default;
165
169
  }
166
170
  });
@@ -196,7 +200,7 @@ class Cli {
196
200
  misprintCoefficient,
197
201
  customRegExpToFindKeys,
198
202
  };
199
- const validationModel = new core_1.NgxTranslateLint(project, languages, ignore, errorConfig, fixZombiesKeys, fetchSettings, i18nextRegExp.reactIntl);
203
+ const validationModel = new core_1.NgxTranslateLint(project, languages, ignore, errorConfig, fixZombiesKeys, fetchSettings);
200
204
  const resultCliModel = yield validationModel.lint(maxWarning);
201
205
  const resultModel = resultCliModel.getResultModel();
202
206
  resultModel.printResult();
@@ -1 +1 @@
1
- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/cli/cli.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/cli/cli.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.reactIntl = void 0;
4
- const mainRegExp = "<[\\s|\\w|\\n]*FormattedMessage[\\s|\\w|\\n|.|=|'|\"]{0,}[^\\w]id=[\"']{1,2}(.*)['\"]{1,2}[^>]*>";
4
+ const formattedMessageRegExp = `(?<=<(?:FormattedMessage|FormattedHTMLMessage)[^>]*?\\bid=(?:\\{?['"]))([^'"]+)(?=['"]\\}?)`;
5
+ const formatMessageRegExp = `(?<=(?<![A-Za-z0-9])formatMessage\\s*\\(\\s*\\{[^}]*?\\bid\\s*:\\s*['"])([^'"]+)(?=['"])`;
5
6
  exports.reactIntl = [
6
- mainRegExp
7
+ formattedMessageRegExp,
8
+ formatMessageRegExp
7
9
  ];
8
10
  //# sourceMappingURL=regex.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"regex.js","sourceRoot":"","sources":["../../../src/react-intl/regex.ts"],"names":[],"mappings":";;;AAAA,MAAM,UAAU,GAAW,kGAAkG,CAAC;AAEjH,QAAA,SAAS,GAAa;IAC/B,UAAU;CACb,CAAC"}
1
+ {"version":3,"file":"regex.js","sourceRoot":"","sources":["../../../src/react-intl/regex.ts"],"names":[],"mappings":";;;AAAA,MAAM,sBAAsB,GAAW,6FAA6F,CAAC;AACrI,MAAM,mBAAmB,GAAW,0FAA0F,CAAC;AAElH,QAAA,SAAS,GAAa;IAC/B,sBAAsB;IACtB,mBAAmB;CACtB,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "author": "Raman Lauryniuk <romanrostislavovich@gmail.com>",
3
3
  "name": "react-intl-lint",
4
- "version": "1.1.0",
4
+ "version": "1.2.0",
5
5
  "description": "Simple tools for check `react-intl` keys in app",
6
6
  "license": "MIT",
7
7
  "repository": "svoboda-rabstvo/react-intl-lint",
@@ -77,10 +77,10 @@
77
77
  ]
78
78
  },
79
79
  "dependencies": {
80
- "chalk": "^5.6.2",
81
- "commander": "^14.0.1",
82
- "conventional-cli": "^1.2.0",
83
- "ngx-translate-lint": "^1.26.1"
80
+ "chalk": "^5.6.2",
81
+ "commander": "^14.0.1",
82
+ "conventional-cli": "^1.2.0",
83
+ "ngx-translate-lint": "^1.27.1"
84
84
  },
85
85
  "devDependencies": {
86
86
  "@types/chai": "^5.2.2",