arcadible 0.1.48 → 0.1.50

package/bin/arc-init.js

@@ -149,7 +149,7 @@ const main = function (argv) {
         default: conf.template,
         describe: [
           "Project template",
-          "Public GitHub repository (format: user/repo).",
+          "Public GitHub repository, or a folder in one (user/repo[/folder]).",
         ].join("\n"),
         type: "string",
       })

package/package.json

@@ -79,5 +79,5 @@
   "scripts": {
     "test": "node --test \"test/**/*.test.js\""
   },
-  "version": "0.1.48"
+  "version": "0.1.50"
 }

package/src/action/init/tool.js

@@ -22,6 +22,7 @@ const ArcError = error.ArcError;
 const detectVersion = manifest.detectVersion;
 const join = path.join;
 const prepare = manifest.prepare;
+const readdir = fs.readdir;
 const remove = fs.remove;
 const resolve = path.resolve;
 
@@ -37,6 +38,28 @@ const removeLicense = function (dest) {
 
 // [function]
 
+const unavailable = function (src, cause) {
+  return new ArcError(
+    cfgcode.TEMPLATE_UNAVAILABLE,
+    phrase.templateUnavailable(src),
+    { cause },
+  );
+};
+
+// [function]
+
+// degit copies nothing, without failing, from a folder a repository doesn't
+// have, so an empty project fails as a missing repository does.
+const ensureCopied = async function (src, dest) {
+  const names = await readdir(dest).catch(() => []);
+  if (names.length === 0) {
+    await remove(dest);
+    throw unavailable(src);
+  }
+};
+
+// [function]
+
 const scaffold = function (src, dest, { onInitBegin }) {
   if (onInitBegin) {
     onInitBegin({ dest, src });
@@ -44,14 +67,9 @@ const scaffold = function (src, dest, { onInitBegin }) {
   return degit(src, { cache: false, force: true, verbose: false })
     .clone(dest)
     .catch((ex) => {
-      throw new ArcError(
-        cfgcode.TEMPLATE_UNAVAILABLE,
-        phrase.templateUnavailable(src),
-        {
-          cause: ex,
-        },
-      );
-    });
+      throw unavailable(src, ex);
+    })
+    .then(() => ensureCopied(src, dest));
 };
 
 // [function]

package/src/config/template.js

@@ -8,7 +8,7 @@ const phrase = require("../phrase");
 // [declare]
 
 const HANDLE = cfgproduct.handle;
-const STARTER = `${HANDLE}/starter`;
+const STARTERS = `${HANDLE}/starters`;
 
 // [export]
 
@@ -17,29 +17,29 @@ module.exports = {
     {
       description: phrase.starterBlank(),
       name: "Blank",
-      value: STARTER,
+      value: `${STARTERS}/blank`,
     },
     {
       description: phrase.starterThreeJs(),
       name: "Three.js",
-      value: `${STARTER}-threejs`,
+      value: `${STARTERS}/threejs`,
     },
     {
       description: phrase.starterPhaser(),
       name: "Phaser",
-      value: `${STARTER}-phaser`,
+      value: `${STARTERS}/phaser`,
     },
     {
       description: phrase.starterPixiJs(),
       name: "PixiJS",
-      value: `${STARTER}-pixijs`,
+      value: `${STARTERS}/pixijs`,
     },
     {
       description: phrase.starterBabylonJs(),
       name: "Babylon.js",
-      value: `${STARTER}-babylonjs`,
+      value: `${STARTERS}/babylonjs`,
     },
   ],
-  default: STARTER,
+  default: `${STARTERS}/blank`,
   message: "Template",
 };

package/src/phrase.js

@@ -823,7 +823,7 @@ const tagPushed = function (tag) {
 const templateUnavailable = function (template) {
   return blocks(
     `Unable to download template ${template}.`,
-    "Check that it's a public GitHub repository.",
+    "Check that it's a public GitHub repository, or a folder in one.",
   );
 };
 

package/src/serve/game.js

@@ -182,4 +182,4 @@ const gameHandler = function ({ files, onRemote = () => null, page, remote }) {
 
 // [export]
 
-module.exports = { endWith, gameHandler, segmentsOf };
+module.exports = { endWith, gameHandler };

package/src/serve/reload.js

@@ -60,4 +60,4 @@ const watchDir = function (dir, onChange) {
 
 // [export]
 
-module.exports = { SETTLE, reloader, watchDir };
+module.exports = { reloader, watchDir };