@keymanapp/kmc-package 18.0.137-alpha → 18.0.138-alpha
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-validation.d.ts","sourceRoot":"","sources":["../../../src/compiler/package-validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"package-validation.d.ts","sourceRoot":"","sources":["../../../src/compiler/package-validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,MAAM,yBAAyB,CAAC;AAIzE,OAAO,EAAgB,iBAAiB,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE9F;;GAEG;AACH,qBAAa,iBAAiB;IAEhB,OAAO,CAAC,SAAS;IAAqB,OAAO,CAAC,OAAO;gBAA7C,SAAS,EAAE,iBAAiB,EAAU,OAAO,EAAE,eAAe;IAG3E,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,WAAW;IAmBlE,OAAO,CAAC,uCAAuC;IAsC/C,OAAO,CAAC,uCAAuC;IAmB/C,OAAO,CAAC,kBAAkB;IAoB1B,OAAO,CAAC,cAAc;IAsBtB,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,gBAAgB;IAkBxB,OAAO,CAAC,6BAA6B;IAiCrC,OAAO,CAAC,gBAAgB;CAuBzB"}
|
|
@@ -1,18 +1,8 @@
|
|
|
1
|
-
import { KeymanFileTypes } from '@keymanapp/common-types';
|
|
1
|
+
import { KeymanFileTypes, } from '@keymanapp/common-types';
|
|
2
|
+
import { SourceFilenamePatterns } from '@keymanapp/developer-utils';
|
|
2
3
|
import { PackageCompilerMessages } from './package-compiler-messages.js';
|
|
3
4
|
import { keymanEngineForWindowsFiles, keymanForWindowsInstallerFiles, keymanForWindowsRedistFiles } from './redist-files.js';
|
|
4
5
|
import { isValidEmail } from '@keymanapp/developer-utils';
|
|
5
|
-
// The keyboard ID SHOULD adhere to this pattern:
|
|
6
|
-
const KEYBOARD_ID_PATTERN_PACKAGE = /^[a-z_][a-z0-9_]*\.(kps|kmp)$/;
|
|
7
|
-
// The model ID SHOULD adhere to this pattern:
|
|
8
|
-
// author .bcp47 .uniq
|
|
9
|
-
const MODEL_ID_PATTERN_PACKAGE = /^[a-z_][a-z0-9_]*\.[a-z_][a-z0-9_-]*\.[a-z_][a-z0-9_]*\.model\.(kps|kmp)$/;
|
|
10
|
-
// const MODEL_ID_PATTERN_JS = /^[a-z_][a-z0-9_]*\.[a-z_][a-z0-9_-]*\.[a-z_][a-z0-9_]*\.model\.js$/;
|
|
11
|
-
// const MODEL_ID_PATTERN_TS = /^[a-z_][a-z0-9_]*\.[a-z_][a-z0-9_-]*\.[a-z_][a-z0-9_]*\.model\.ts$/;
|
|
12
|
-
// const MODEL_ID_PATTERN_PROJECT = /^[a-z_][a-z0-9_]*\.[a-z_][a-z0-9_-]*\.[a-z_][a-z0-9_]*\.model\.kpj$/;
|
|
13
|
-
// "Content files" within the package should adhere to these pattern:
|
|
14
|
-
const CONTENT_FILE_BASENAME_PATTERN = /^[a-z0-9_+.-]+$/i; // base names can be case insensitive
|
|
15
|
-
const CONTENT_FILE_EXTENSION_PATTERN = /^(\.[a-z0-9_-]+)?$/; // extensions should be lower-case or empty
|
|
16
6
|
/**
|
|
17
7
|
* @internal
|
|
18
8
|
*/
|
|
@@ -93,7 +83,7 @@ export class PackageValidation {
|
|
|
93
83
|
return true;
|
|
94
84
|
}
|
|
95
85
|
filename = this.callbacks.path.basename(filename);
|
|
96
|
-
if (!MODEL_ID_PATTERN_PACKAGE.test(filename)) {
|
|
86
|
+
if (!SourceFilenamePatterns.MODEL_ID_PATTERN_PACKAGE.test(filename)) {
|
|
97
87
|
this.callbacks.reportMessage(PackageCompilerMessages.Warn_PackageNameDoesNotFollowLexicalModelConventions({ filename }));
|
|
98
88
|
}
|
|
99
89
|
for (let model of kmpJson.lexicalModels) {
|
|
@@ -108,7 +98,7 @@ export class PackageValidation {
|
|
|
108
98
|
return true;
|
|
109
99
|
}
|
|
110
100
|
filename = this.callbacks.path.basename(filename);
|
|
111
|
-
if (!KEYBOARD_ID_PATTERN_PACKAGE.test(filename)) {
|
|
101
|
+
if (!SourceFilenamePatterns.KEYBOARD_ID_PATTERN_PACKAGE.test(filename)) {
|
|
112
102
|
this.callbacks.reportMessage(PackageCompilerMessages.Warn_PackageNameDoesNotFollowKeyboardConventions({ filename }));
|
|
113
103
|
}
|
|
114
104
|
for (let keyboard of kmpJson.keyboards) {
|
|
@@ -133,7 +123,8 @@ export class PackageValidation {
|
|
|
133
123
|
const ext = this.callbacks.path.extname(filename);
|
|
134
124
|
const base = filename.substring(0, filename.length - ext.length);
|
|
135
125
|
if (this.options.checkFilenameConventions) {
|
|
136
|
-
if (!CONTENT_FILE_BASENAME_PATTERN.test(base) ||
|
|
126
|
+
if (!SourceFilenamePatterns.CONTENT_FILE_BASENAME_PATTERN.test(base) ||
|
|
127
|
+
!SourceFilenamePatterns.CONTENT_FILE_EXTENSION_PATTERN.test(ext)) {
|
|
137
128
|
this.callbacks.reportMessage(PackageCompilerMessages.Warn_FileInPackageDoesNotFollowFilenameConventions({ filename }));
|
|
138
129
|
}
|
|
139
130
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-validation.js","sourceRoot":"","sources":["../../../src/compiler/package-validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,eAAe,
|
|
1
|
+
{"version":3,"file":"package-validation.js","sourceRoot":"","sources":["../../../src/compiler/package-validation.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -29,13 +29,13 @@
|
|
|
29
29
|
"url": "https://github.com/keymanapp/keyman/issues"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@keymanapp/common-types": "18.0.
|
|
33
|
-
"@keymanapp/developer-utils": "18.0.
|
|
32
|
+
"@keymanapp/common-types": "18.0.138-alpha",
|
|
33
|
+
"@keymanapp/developer-utils": "18.0.138-alpha",
|
|
34
34
|
"jszip": "^3.7.0",
|
|
35
35
|
"marked": "^7.0.0"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
|
-
"@keymanapp/developer-test-helpers": "18.0.
|
|
38
|
+
"@keymanapp/developer-test-helpers": "18.0.138-alpha",
|
|
39
39
|
"@types/mocha": "^5.2.7",
|
|
40
40
|
"@types/node": "^20.4.1",
|
|
41
41
|
"c8": "^7.12.0",
|
|
@@ -64,5 +64,5 @@
|
|
|
64
64
|
"type": "git",
|
|
65
65
|
"url": "git+https://github.com/keymanapp/keyman.git"
|
|
66
66
|
},
|
|
67
|
-
"version": "18.0.
|
|
67
|
+
"version": "18.0.138-alpha"
|
|
68
68
|
}
|