npm-pkgbuild 7.14.0 → 7.14.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "7.14.0",
+  "version": "7.14.4",
   "publishConfig": {
     "access": "public"
   },

package/src/content/file-content-provider.mjs

@@ -35,9 +35,7 @@ export class FileContentProvider extends ContentProvider {
     for (const name of await globby(definitions.pattern, {
       cwd: base
     })) {
-      const entry = new FileSystemEntry(name, base);
-      Object.assign(entry, this.entryProperties);
-      yield entry;
+      yield Object.assign(new FileSystemEntry(name, base), this.entryProperties);
     }
   }
 }

package/src/content/node-modules-content-provider.mjs

@@ -1,3 +1,6 @@
+import { join } from "path";
+import { globby } from "globby";
+import { FileSystemEntry } from "content-entry-filesystem";
 import { ContentProvider } from "./content-provider.mjs";
 
 /**
@@ -11,9 +14,119 @@ export class NodeModulesContentProvider extends ContentProvider {
     return "node-modules";
   }
 
-  static get description()
-  {
-    return "use node-modules as source";
+  static get description() {
+    return "use node_modules as source";
+  }
+
+  constructor(definitions, entryProperties) {
+    super();
+    Object.assign(this, definitions);
+    this.entryProperties = entryProperties;
   }
 
+  async *[Symbol.asyncIterator]() {
+    const cwd = this.dir;
+    for (const name of await globby("node_modules/**/*", {
+      cwd
+    })) {
+      yield Object.assign(new FileSystemEntry(name, cwd),this.entryProperties);
+    }
+  }
 }
+
+const toBeIgnored = [
+  {
+    options: { filesOnly: true },
+    pattern: [".git*", ".npm*", "rollup.config.*", ".travis.yml"]
+  },
+  {
+    options: { filesOnly: true },
+    pattern: [
+      "*~",
+      "*.bak",
+      "*.mk",
+      "*.bat",
+      "*.tmp",
+      "*.log",
+      "*.orig",
+      "*.d.ts*",
+      "*.1",
+      "*.2",
+      "*.3",
+      "*.4",
+      "*.5",
+      "*.6",
+      "*.7",
+      "*.8",
+      "*.9",
+      "*.patch",
+      "*.cc",
+      "*.c",
+      "*.h",
+      "*.h.in",
+      "*.cmake",
+      "*.gyp",
+      ".jshintrc*",
+      ".esl*",
+      ".zuul.yml",
+      ".doclets.yml",
+      ".editorconfig",
+      ".tern-project",
+      ".dockerignore",
+      ".dir-locals.el",
+      "appveyor.yml",
+      "yarn.lock",
+      "gulpfile.js",
+      "jsdoc.json",
+      "Gruntfile.js",
+      "karma.conf.js",
+      "verb.md",
+      ".nvmrc",
+      "config.gypi",
+      "bower.json",
+      "*.bash_completion.*",
+      ".coveralls.yml",
+      ".istanbul.yml",
+      ".babelrc.*",
+      ".nycrc",
+      ".DS_Store",
+      ".env",
+      "x-package.json5",
+      "component.json",
+      "tsconfig.json",
+      "cypress.json",
+      ".airtap.yml",
+      ".jscs.json",
+      "sauce-labs.svg"
+    ]
+  },
+  {
+    options: { ignoreCase: true },
+    pattern: [
+      "*Makefile*",
+      "CONTRIBUTING*",
+      "Contributors*",
+      "CHANGES*",
+      "PATENTS*",
+      "readme*.md",
+      "AUTHORS*",
+      "NOTICE*",
+      "HISTORY*",
+      "SUMMARY.md",
+      "MIGRAT*.md",
+      "UPGRAD*.md",
+      "PULL_REQUEST_TEMPLATE.md",
+      "PATTERNS.md",
+      "REFERENCE.md",
+      "SECURITY.md",
+      "SFTPStream.md",
+      "LIMITS.md",
+      "GOVERNANCE.md",
+      "Porting-Buffer.md",
+      "chains and topics.md",
+      "CODE_OF_CONDUCT*",
+      "CODEOWNERS",
+      "LICENSE.DOCS*"
+    ]
+  }
+];

package/src/content/npm-pack-content-provider.mjs

@@ -20,9 +20,10 @@ export class NPMPackContentProvider extends ContentProvider {
     return "use npm pack as source";
   }
 
-  constructor(definitions) {
+  constructor(definitions, entryProperties) {
     super();
     Object.assign(this, definitions);
+    this.entryProperties = entryProperties;
   }
 
   async *[Symbol.asyncIterator]() {
@@ -45,9 +46,12 @@ export class NPMPackContentProvider extends ContentProvider {
         console.log(header.name.substring);
 
         entries.push(
-          new BufferContentEntry(
-            header.name.substring(8),
-            Buffer.concat(chunks)
+          Object.assign(
+            new BufferContentEntry(
+              header.name.substring(8),
+              Buffer.concat(chunks)
+            ),
+            this.entryProperties
           )
         );
 

package/src/extract-from-package.mjs

@@ -51,7 +51,7 @@ export async function extractFromPackage(pkg, dir) {
   let sources = [];
   let output = {};
 
-  const processPkg = (pkg,dir) => {
+  const processPkg = (pkg, dir) => {
     if (pkg.pkg) {
       const pkgbuild = pkg.pkg;
 
@@ -65,19 +65,23 @@ export async function extractFromPackage(pkg, dir) {
         Object.entries(pkgbuild.content).forEach(
           ([destination, definitions]) => {
             for (const definition of asArray(definitions)) {
-                if(definition.type) {
-                    const type = allInputs.find(i => i.name === definition.type);
-                    if(type) {
-                        delete definition.type;
-                        sources.push(new type({ ...definition, dir}, { destination }));
-                    }
-                    else {
-                        console.error("Unknown type '${type}'");
-                    }
-                }
-                else {
-                    sources.push(new FileContentProvider(definition, { destination }));
+              const entryProperties = { destination };
+
+              if (definition.type) {
+                const type = allInputs.find(i => i.name === definition.type);
+                if (type) {
+                  delete definition.type;
+                  sources.push(
+                    new type({ ...definition, dir }, entryProperties)
+                  );
+                } else {
+                  console.error("Unknown type '${type}'");
                 }
+              } else {
+                sources.push(
+                  new FileContentProvider(definition, entryProperties)
+                );
+              }
             }
           }
         );
@@ -88,7 +92,7 @@ export async function extractFromPackage(pkg, dir) {
   };
 
   await packageWalker(async (pkg, base, modulePath) => {
-    processPkg(pkg,base);
+    processPkg(pkg, base);
     return true;
   }, dir);
 

package/src/npm-pkgbuild-cli.mjs

@@ -72,7 +72,6 @@ program
       for (const inputFactory of allInputs.filter(
         inputFactory => options[inputFactory.name] === true
       )) {
-        console.log("ADD", inputFactory);
         sources.push(new inputFactory());
       }