@eslinted/core 26.1.2 → 26.1.4

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":"index.d.ts","sourceRoot":"","sources":["../../src/factory/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,CAAC,OAAO,UAAU,OAAO,CAC7B,KAAK,SAAS,MAAM,EACpB,QAAQ,SAAS,KAAK,EACtB,MAAM,SAAS,MAAM,EACrB,MAAM,SAAS,KAAK,EAEpB,MAAM,EAAE,SAAS,KAAK,EAAE,EACxB,QAAQ,EAAE,SAAS,QAAQ,EAAE,EAC7B,IAAI,EAAE,KAAK,CACT,SAAS;IACP,KAAK;IACL,SAAS,KAAK,EAAE;CACjB,CACF,EACD,EACE,OAAO,EACP,OAAO,GACR,EAAE;IACD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC,EACD,QAAQ,EAAE,KAAK,CACb,KAAK,EACL,QAAQ,EACR,MAAM,EACN,MAAM,CACP,CAAC,eAAe,CAAC,CAAC,UAAU,CAAC,EAC9B,UAAU,GAAE,KAAK,CACf,KAAK,EACL,QAAQ,EACR,MAAM,EACN,MAAM,CACP,CAAC,eAAe,CAAC,CAAC,YAAY,CAAM,aA4OtC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/factory/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,CAAC,OAAO,UAAU,OAAO,CAC7B,KAAK,SAAS,MAAM,EACpB,QAAQ,SAAS,KAAK,EACtB,MAAM,SAAS,MAAM,EACrB,MAAM,SAAS,KAAK,EAEpB,MAAM,EAAE,SAAS,KAAK,EAAE,EACxB,QAAQ,EAAE,SAAS,QAAQ,EAAE,EAC7B,IAAI,EAAE,KAAK,CACT,SAAS;IACP,KAAK;IACL,SAAS,KAAK,EAAE;CACjB,CACF,EACD,EACE,OAAO,EACP,OAAO,GACR,EAAE;IACD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC,EACD,QAAQ,EAAE,KAAK,CACb,KAAK,EACL,QAAQ,EACR,MAAM,EACN,MAAM,CACP,CAAC,eAAe,CAAC,CAAC,UAAU,CAAC,EAC9B,UAAU,GAAE,KAAK,CACf,KAAK,EACL,QAAQ,EACR,MAAM,EACN,MAAM,CACP,CAAC,eAAe,CAAC,CAAC,YAAY,CAAM,aAgRtC"}
@@ -73,6 +73,16 @@ export default function factory(scopes, optional, tree, { plugins, parsers, }, d
73
73
  parentIgnores[L + i] = ignores[i];
74
74
  }
75
75
  }
76
+ if (extensions["*"] !== undefined)
77
+ if (extensions["*"].override === true)
78
+ Object.assign(defaults.ignores, { "*": extensions["*"].ignores ?? [] });
79
+ else if (extensions["*"].ignores !== undefined)
80
+ if (extensions["*"].ignores.length !== 0) {
81
+ const { ignores } = extensions["*"], defaultGlobals = defaults.ignores["*"], L = defaultGlobals.length;
82
+ defaultGlobals.length += ignores.length;
83
+ for (let i = 0; i < ignores.length; i++)
84
+ defaultGlobals[L + i] = ignores[i];
85
+ }
76
86
  const configs = [
77
87
  {
78
88
  name: "linted/*/plugins",
@@ -80,9 +90,7 @@ export default function factory(scopes, optional, tree, { plugins, parsers, }, d
80
90
  },
81
91
  {
82
92
  name: "linted/*/ignores",
83
- ignores: extensions["*"]?.override === true
84
- ? extensions["*"].ignores ?? []
85
- : defaults.ignores["*"].concat(extensions["*"]?.ignores ?? []),
93
+ ignores: defaults.ignores["*"],
86
94
  },
87
95
  ], scopeConfigs = scopes.flatMap(scope => {
88
96
  const { files: { [scope]: files }, ignores: { [scope]: ignores = [] }, rules: { [scope]: rules }, settings: { [scope]: settings }, } = defaults;
@@ -100,15 +108,27 @@ export default function factory(scopes, optional, tree, { plugins, parsers, }, d
100
108
  ignores,
101
109
  };
102
110
  if (settings !== undefined) {
103
- const { languageOptions = {}, parserOptions, processor, language, } = settings;
104
- if (languageOptions.parser !== undefined)
111
+ const { languageOptions, parserOptions, processor, language, } = settings;
112
+ if (languageOptions?.parser !== undefined)
105
113
  languageOptions.parser = parsers[languageOptions.parser];
106
114
  if (parserOptions?.parser !== undefined)
107
115
  parserOptions.parser = parsers[parserOptions.parser];
108
- if (parserOptions !== undefined && Object.keys(parserOptions).length !== 0)
109
- Object.assign(languageOptions, { parserOptions });
110
- if (Object.keys(languageOptions).length !== 0)
111
- Object.assign(manifest, { languageOptions });
116
+ if (languageOptions === undefined) {
117
+ if (parserOptions !== undefined
118
+ && Object.keys(parserOptions).length !== 0)
119
+ Object.assign(manifest, {
120
+ languageOptions: {
121
+ parserOptions,
122
+ },
123
+ });
124
+ }
125
+ else {
126
+ if (parserOptions !== undefined
127
+ && Object.keys(parserOptions).length !== 0)
128
+ Object.assign(languageOptions, { parserOptions });
129
+ if (Object.keys(languageOptions).length !== 0)
130
+ Object.assign(manifest, { languageOptions });
131
+ }
112
132
  if (processor !== undefined)
113
133
  Object.assign(manifest, { processor });
114
134
  if (language !== undefined)
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/factory/index.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,UAAU,OAAO,CAM7B,MAAwB,EACxB,QAA6B,EAC7B,IAKC,EACD,EACE,OAAO,EACP,OAAO,GAIR,EACD,QAK8B,EAC9B,aAKmC,EAAE;IAErC,KAAK,MAAM,KAAK,IAAI,QAAQ;QAC1B,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE,CAAC;YACpC,MAAM,CAAC,MAAM,CACX,OAAO,EACP;gBACE,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,MAAM;aAClC,CACF,CAAC;YACF,MAAM,CAAC,MAAM,CACX,OAAO,EACP;gBACE,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,MAAM;aAClC,CACF,CAAC;QACJ,CAAC;IAEH,KAAK,MAAM,KAAK,IAAI,MAAM;QACxB,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE,CAAC;YACpC,MAAM,EACJ,CAAC,KAAK,CAAC,EAAE,EACP,KAAK,GAAG,EAAE,EACV,OAAO,GAAG,EAAE,EACZ,KAAK,GAAG,IAAI,GACb,GAAG,EAAE,GACP,GAAG,UAAU,CAAC;YAEf,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;gBACpB,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,SAAS;oBACrC,MAAM,CAAC,MAAM,CACX,QAAQ,CAAC,KAAK,EACd,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CACnB,CAAC;qBACC,CAAC;oBACJ,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAC1C,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC;oBAExB,YAAY,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC;oBAEpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE;wBACnC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAW,CAAC;gBAC7C,CAAC;YAEH,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;gBACtB,IAAI,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,SAAS;oBACvC,MAAM,CAAC,MAAM,CACX,QAAQ,CAAC,OAAO,EAChB,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,CACrB,CAAC;qBACC,CAAC;oBACJ,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAC9C,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC;oBAE1B,cAAc,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;oBAExC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE;wBACrC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAW,CAAC;gBACjD,CAAC;YAEH,IAAI,KAAK,KAAK,IAAI;gBAChB,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,SAAS;oBACrC,MAAM,CAAC,MAAM,CACX,QAAQ,CAAC,KAAK,EACd;wBACE,CAAC,KAAK,CAAC,EAAE;4BACP;gCACE,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC;gCAC7B,KAAK;6BACN;yBACF;qBACF,CACF,CAAC;;oBAGF,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CACnB,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAC7B,GAAG;wBACF,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC;wBAC7B,KAAK;qBACN,CAAC;QACR,CAAC;IAEH,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAQ,QAAQ,CAAC,CAAC;IAE1C,KAAK,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,IAAI;QACjC,IACE,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC;eACjB,KAAK,IAAI,OAAO,EACnB,CAAC;YACD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EACnC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAElC,IAAI,KAAK,KAAK,SAAS;gBACrB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;oBACpB,KAAK,MAAM,MAAM,IAAI,OAAO;wBAC1B,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,SAAS;4BACtC,MAAM,CAAC,MAAM,CACX,QAAQ,CAAC,KAAK,EACd,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CACpB,CAAC;6BACC,CAAC;4BACJ,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,EAC1C,CAAC,GAAG,WAAW,CAAC,MAAM,CAAC;4BAEvB,WAAW,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC;4BAEnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE;gCACnC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;wBACnC,CAAC;YAEP,IAAI,OAAO,KAAK,SAAS;gBACvB,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;oBACtB,KAAK,MAAM,MAAM,IAAI,OAAO;wBAC1B,IAAI,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,SAAS;4BACxC,MAAM,CAAC,MAAM,CACX,QAAQ,CAAC,OAAO,EAChB,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CACtB,CAAC;6BACC,CAAC;4BACJ,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAC9C,CAAC,GAAG,aAAa,CAAC,MAAM,CAAC;4BAEzB,aAAa,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;4BAEvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE;gCACrC,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAE,CAAC;wBACvC,CAAC;QACT,CAAC;IAEH,MAAM,OAAO,GAAc;QACzB;YACE,IAAI,EAAE,kBAAkB;YACxB,OAAO;SACR;QACD;YACE,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,QAAQ,KAAK,IAAI;gBACzC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,OAAO,IAAI,EAAE;gBAC/B,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,OAAO,IAAI,EAAE,CAAC;SACjE;KACF,EACD,YAAY,GAAc,MAAM,CAAC,OAAO,CACtC,KAAK,CAAC,EAAE;QACN,MAAM,EACJ,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EACzB,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,EAAE,EAAE,EAClC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EACzB,QAAQ,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,GAChC,GAAG,QAAQ,CAAC;QAEb,IACE,KAAK,KAAK,SAAS;eAChB,KAAK,KAAK,SAAS;eACnB,KAAK,CAAC,MAAM,KAAK,CAAC;eAClB,KAAK,CAAC,MAAM,KAAK,CAAC;eAClB,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC;mBACnB,CAAC,CAAC,KAAK,IAAI,OAAO,CAAC;YAGtB,OAAO,EAAE,CAAC;aACP,CAAC;YACJ,MAAM,QAAQ,GAAG;gBACf,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;gBAC7B,KAAK;gBACL,OAAO;aACR,CAAC;YAEF,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC3B,MAAM,EACJ,eAAe,GAAG,EAAE,EACpB,aAAa,EACb,SAAS,EACT,QAAQ,GACT,GAAG,QAAQ,CAAC;gBAEb,IAAI,eAAe,CAAC,MAAM,KAAK,SAAS;oBACtC,eAAe,CAAC,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,MAAgB,CAAsB,CAAC;gBAE1F,IAAI,aAAa,EAAE,MAAM,KAAK,SAAS;oBACrC,aAAa,CAAC,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,MAAgB,CAAsB,CAAC;gBAEtF,IAAI,aAAa,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,KAAK,CAAC;oBACxE,MAAM,CAAC,MAAM,CACX,eAAe,EACf,EAAE,aAAa,EAAE,CAClB,CAAC;gBAEJ,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,KAAK,CAAC;oBAC3C,MAAM,CAAC,MAAM,CACX,QAAQ,EACR,EAAE,eAAe,EAAE,CACpB,CAAC;gBAEJ,IAAI,SAAS,KAAK,SAAS;oBACzB,MAAM,CAAC,MAAM,CACX,QAAQ,EACR,EAAE,SAAS,EAAE,CACd,CAAC;gBAEJ,IAAI,QAAQ,KAAK,SAAS;oBACxB,MAAM,CAAC,MAAM,CACX,QAAQ,EACR,EAAE,QAAQ,EAAE,CACb,CAAC;YACN,CAAC;YAED,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CACtB,KAAK,CAAC,GAAG,CACP,CACE,EACE,EAAE,EACF,KAAK,GACN,EACD,EAAE,CAAC,CAAC;gBACJ,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC;gBACtC,KAAK;gBACL,OAAO;gBACP,KAAK;aACN,CAAC,CACH,CACF,CAAC;QACJ,CAAC;IACH,CAAC,CACF,CAAC;IAEF,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;QAEzB,OAAO,CAAC,MAAM,IAAI,YAAY,CAAC,MAAM,CAAC;QAEtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE;YAC1C,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/factory/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "$schema": "https://json.schemastore.org/package",
4
4
  "$help": "https://docs.npmjs.com/cli/configuring-npm/package-json",
5
5
  "name": "@eslinted/core",
6
- "version": "26.1.2",
6
+ "version": "26.1.4",
7
7
  "repository": "github:jimmy-zhening-luo/linted-core",
8
8
  "description": "Internal core for npm package `linted`, responsible for producing an array of fully-formed ESLint configurations according to `linted` spec.",
9
9
  "keywords": [],
@@ -73,7 +73,7 @@ export default function factory<
73
73
  defaultFiles.length += files.length;
74
74
 
75
75
  for (let i = 0; i < files.length; i++)
76
- defaultFiles[L + i] = files[i] as string;
76
+ defaultFiles[L + i] = files[i]!;
77
77
  }
78
78
 
79
79
  if (ignores.length !== 0)
@@ -89,7 +89,7 @@ export default function factory<
89
89
  defaultIgnores.length += ignores.length;
90
90
 
91
91
  for (let i = 0; i < ignores.length; i++)
92
- defaultIgnores[L + i] = ignores[i] as string;
92
+ defaultIgnores[L + i] = ignores[i]!;
93
93
  }
94
94
 
95
95
  if (rules !== null)
@@ -162,6 +162,25 @@ export default function factory<
162
162
  }
163
163
  }
164
164
 
165
+ if (extensions["*"] !== undefined)
166
+ if (extensions["*"].override === true)
167
+ Object.assign(
168
+ defaults.ignores,
169
+ { "*": extensions["*"].ignores ?? [] },
170
+ );
171
+ else
172
+ if (extensions["*"].ignores !== undefined)
173
+ if (extensions["*"].ignores.length !== 0) {
174
+ const { ignores } = extensions["*"],
175
+ defaultGlobals = defaults.ignores["*"],
176
+ L = defaultGlobals.length;
177
+
178
+ defaultGlobals.length += ignores.length;
179
+
180
+ for (let i = 0; i < ignores.length; i++)
181
+ defaultGlobals[L + i] = ignores[i]!;
182
+ }
183
+
165
184
  const configs: unknown[] = [
166
185
  {
167
186
  name: "linted/*/plugins",
@@ -169,9 +188,7 @@ export default function factory<
169
188
  },
170
189
  {
171
190
  name: "linted/*/ignores",
172
- ignores: extensions["*"]?.override === true
173
- ? extensions["*"].ignores ?? []
174
- : defaults.ignores["*"].concat(extensions["*"]?.ignores ?? []),
191
+ ignores: defaults.ignores["*"],
175
192
  },
176
193
  ],
177
194
  scopeConfigs: unknown[] = scopes.flatMap(
@@ -202,29 +219,48 @@ export default function factory<
202
219
 
203
220
  if (settings !== undefined) {
204
221
  const {
205
- languageOptions = {},
222
+ languageOptions,
206
223
  parserOptions,
207
224
  processor,
208
225
  language,
209
226
  } = settings;
210
227
 
211
- if (languageOptions.parser !== undefined)
228
+ if (languageOptions?.parser !== undefined)
212
229
  languageOptions.parser = parsers[languageOptions.parser as Parser] as unknown as Parser;
213
230
 
214
231
  if (parserOptions?.parser !== undefined)
215
232
  parserOptions.parser = parsers[parserOptions.parser as Parser] as unknown as Parser;
216
233
 
217
- if (parserOptions !== undefined && Object.keys(parserOptions).length !== 0)
218
- Object.assign(
219
- languageOptions,
220
- { parserOptions },
221
- );
234
+ if (languageOptions === undefined) {
235
+ if (
236
+ parserOptions !== undefined
237
+ && Object.keys(parserOptions).length !== 0
238
+ )
239
+ Object.assign(
240
+ manifest,
241
+ {
242
+ languageOptions: {
243
+ parserOptions,
244
+ },
245
+ },
246
+ );
247
+ }
248
+ else {
249
+ if (
250
+ parserOptions !== undefined
251
+ && Object.keys(parserOptions).length !== 0
252
+ )
253
+ Object.assign(
254
+ languageOptions,
255
+ { parserOptions },
256
+ );
222
257
 
223
- if (Object.keys(languageOptions).length !== 0)
224
- Object.assign(
225
- manifest,
226
- { languageOptions },
227
- );
258
+ if (Object.keys(languageOptions).length !== 0)
259
+ Object.assign(
260
+ manifest,
261
+ { languageOptions },
262
+ );
263
+ }
228
264
 
229
265
  if (processor !== undefined)
230
266
  Object.assign(