piral-cli 0.15.0-beta.4820 → 0.15.0-beta.4830

package/src/rules/piral-has-valid-externals.ts

@@ -1,3 +1,4 @@
+import { findDependencyVersion } from '../common';
 import { PiralRuleContext } from '../types';
 
 export type Options = void;
@@ -6,38 +7,19 @@ export type Options = void;
  * Checks that the externals to be used in pilets are valid.
  */
 export default function (context: PiralRuleContext, options: Options = undefined) {
-  const { externals } = context.info;
+  const { externals } = context;
+  const invalidDepRefs = externals
+    .filter((ext) => !ext.parents || ext.parents.length === 0)
+    .map((ext) => ext.name)
+    .filter((name) => context.dependencies[name] === undefined && context.devDependencies[name] === undefined);
 
-  if (!Array.isArray(externals)) {
-    context.error(
+  for (const invalidDepRef of invalidDepRefs) {
+    context.warning(
       `
-The shared dependencies in pilets.external are invalid.
-  Expected: <Array>.
-  Received: <${typeof externals}>.
+The shared dependency "${invalidDepRef}" is not listed in the "dependencies" and "devDependencies".
+Expected: "${invalidDepRef}" in dependencies.
+Received: <none>.
 `,
     );
-  } else {
-    const invalidDepTypes = externals.filter((ext) => typeof ext !== 'string');
-    const invalidDepRefs = externals.filter((ext) => typeof ext === 'string' && !context.dependencies[ext]);
-
-    if (invalidDepTypes.length > 0) {
-      context.error(
-        `
-The shared dependencies in pilets.external are invalid.
-  Expected: Only names (<string>) in the array.
-  Received: Found ${invalidDepTypes.length} non-<string> entries.
-`,
-      );
-    }
-
-    for (const invalidDepRef of invalidDepRefs) {
-      context.warning(
-        `
-The shared dependency "${invalidDepRef}" is listed in pilets.external, but not in dependencies.
-  Expected: "${invalidDepRef}" in dependencies.
-  Received: <none>.
-`,
-      );
-    }
   }
 }

package/src/types/common.ts

@@ -104,7 +104,6 @@ export interface TemplateFileLocation {
 export interface PiletsInfo {
   files: Array<string | TemplateFileLocation>;
   template: string;
-  externals?: Array<string>;
   devDependencies: Record<string, string | true>;
   scripts: Record<string, string>;
   validators: Record<string, any>;
@@ -147,6 +146,7 @@ export interface Rule<T extends RuleContext> {
 
 export interface PiralRuleContext extends RuleContext {
   info: PiletsInfo;
+  externals: Array<SharedDependency>;
 }
 
 export interface PiletRuleContext extends RuleContext {