create-cloudflare 0.0.1 → 0.0.2

package/bin.js

@@ -25,23 +25,32 @@ if (argv.help) {
 	let output = '';
 
 	output += '\n  Usage';
-	output += '\n    npm init cloudflare <directory> -- [options]';
-	output += '\n    pnpm create cloudflare <directory> [options]';
-	output += '\n    yarn create cloudflare <directory> [options]';
+	output += '\n    npm init cloudflare <directory> <source> -- [options]';
+	output += '\n    pnpm create cloudflare <directory> <source> [options]';
+	output += '\n    yarn create cloudflare <directory> <source> [options]';
+	output += '\n';
+	output += '\n  Sources';
+	output += '\n    • Example — A name or path to an official example subdirectory.';
+	output += '\n        Visit https://github.com/cloudflare/worker-examples/tree/dev for options'; // TODO: update; get nice-name redirect
+	output += '\n    • URL — Any valid git repository address.';
+	output += '\n        [user@]host.xz:path/to/repo.git[#branch]';
+	output += '\n        git://host.xz[:port]/path/to/repo.git[#branch]';
+	output += '\n        ssh://[user@]host.xz[:port]/path/to/repo.git[#branch]';
+	output += '\n        http[s]://host.xz[:port]/path/to/repo.git[#branch]';
+	output += '\n        ftp[s]://host.xz[:port]/path/to/repo.git[#branch]';
 	output += '\n';
 	output += '\n  Options';
-	output += '\n        --force        Force overwrite target directory';
-	output += '\n        --no-init      Do not initialize a git repository';
-	output += '\n        --debug        Print additional error details';
-	output += '\n    -v, --version      Displays current version';
-	output += '\n    -h, --help         Displays this message';
+	output += '\n    --force         Force overwrite target directory';
+	output += '\n    --no-init       Do not initialize a git repository';
+	output += '\n    --debug         Print additional error details';
+	output += '\n    --version, -v   Displays current version';
+	output += '\n    --help, -h      Displays this message';
 	output += '\n';
 	output += '\n  Examples';
-	output += '\n    $ npm init cloudflare my-project';
-	output += '\n    $ npm init cloudflare my-project -- --no-init';
-	output += '\n    $ npm init cloudflare my-project -- pages svelte-kit';
-	output += '\n    $ npm init cloudflare my-project -- https://github.com/user/repo.git';
-	output += '\n    $ npm init cloudflare my-project -- https://github.com/user/repo.git#branch';
+	output += '\n    $ npm init cloudflare my-project pages/svelte-kit -- --debug';
+	output += '\n    $ yarn create cloudflare my-project workshops/intro-workers --force';
+	output += '\n    $ pnpm create cloudflare my-project https://github.com/user/repo.git#branch';
+	output += '\n    $ npm init cloudflare my-project https://github.com/user/repo.git';
 	output += '\n';
 
 	exit(output, 0);
@@ -54,10 +63,10 @@ if (argv.version) {
 
 (async function () {
 	try {
-		console.log(argv);
-		let dir = argv._.join('-').trim().replace(/[\s_]+/g, '-');
-		if (!dir) return exit('Missing <name> argument', 1);
-		await require('.').setup(dir, argv);
+		let [dir, source] = argv._;
+		if (!dir) return exit('Missing <directory> argument', 1);
+		if (!source) return exit('Missing <source> argument', 1);
+		await require('.').setup(dir, source, argv);
 	} catch (err) {
 		exit(err && err.stack || err, 1);
 	}

package/index.js

@@ -1 +1 @@
-const e = require('path');const r = require('fs');const { join:t } = require('path');const { promisify:s } = require('util');const { exec:o } = require('child_process');s(o);var i=r.existsSync;function f(e){return r.promises.rm(e,{recursive:!0})}async function a(r,t){let s=process.cwd(),o=e.join(s,r);if(console.log({target:o}),i(o)){if(!t.force){let r=`Refusing to overwrite existing "${e.relative(s,o)}" directory.\n`;throw r+="Please specify a different directory or use the `--force` flag.",new Error(r)}if(!o.startsWith(s))throw new Error("Refusing to manipulate the file system outside the PWD location.\nPlease specify a different target directory.");await f(o)}let a=!1,[l,n]=t._||[];if(console.log({source:l,filter:n}),!l)throw new Error("Missing source value(s).\nPlease view the `--help` text.");if(/^(https?|ftps?|file|git|ssh):\/\//.test(l))a=!0;else if(!n&&l.includes(":"))a=!0;else{if(l=l.toLowerCase(),!n)throw new Error("Missing filter");if(/^workers?/.test(l))n="workers/"+n;else{if("pages"!==l)throw new Error(`Invalid "${l}" source.`);n="pages/"+n}l="https://github.com/cloudflare/worker-examples.git"}return console.log({target:o,source:l,filter:n})}exports.setup=a;
+const t = require('semiver');const e = require('fs');const { tmpdir:r } = require('os');const { promisify:i } = require('util');const { join:s, relative:o } = require('path');const { exec:a } = require('child_process');var n=i(a),c=e.existsSync;async function f(t){c(t)&&e.promises.rm(t,{recursive:!0})}var p=(...t)=>n(`git ${t.join(" ")}`),l=()=>Math.random().toString(16).substring(2);async function u(i,a,u){let w=process.cwd(),h=s(w,i);if(c(h)){if(!u.force){let t=`Refusing to overwrite existing "${o(w,h)}" directory.\n`;throw t+="Please specify a different directory or use the `--force` flag.",new Error(t)}if(!h.startsWith(w))throw new Error("Refusing to manipulate the file system outside the PWD location.\nPlease specify a different target directory.");await f(h)}let m="",g="";if(/^(https?|ftps?|file|git|ssh):\/\//.test(a)||a.includes(":")?m=a:(m="https://github.com/cloudflare/worker-examples.git",g=a),g){try{var{stdout:d}=await p("version")}catch{throw new Error("Missing `git` executable")}let[e]=/\d+.\d+.\d+/.exec(d)||[];if(!e)throw new Error("Unknown `git` version");if(t(e,"2.19.0")<0)throw new Error("Requires git version 2.19.0 or newer")}try{await async function(t,i,o){let a=["clone --depth 1"],c=i;o&&(a.push("--filter=blob:none --sparse"),c=s(r(),l()+"-"+l()));let u=t.lastIndexOf("#");-1===u?(t.includes("worker-examples")&&a.push("-b dev"),a.push(t)):(a.push(`-b ${t.substring(u+1)}`),a.push(t.substring(0,u))),a.push(c),await p(...a),o&&(await n(`git sparse-checkout set "${o}"`,{cwd:c}),await e.promises.rename(s(c,o),i),await f(c))}(m,h,g)}catch(t){throw u.debug&&console.error(t.toString()),new Error(`Error cloning "${m}" repository`)}await async function(t,e){await f(s(t,".git")),e&&await p("init -b main",t)}(h,!!u.init),console.log("Done~!")}exports.setup=u;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.1",
+  "version": "0.0.2",
   "name": "create-cloudflare",
   "repository": "lukeed/create-cloudflare",
   "description": "TODO",
@@ -24,7 +24,8 @@
   },
   "dependencies": {
     "kleur": "^4.0.0",
-    "mri": "^1.2.0"
+    "mri": "^1.2.0",
+    "semiver": "^1.1.0"
   },
   "devDependencies": {
     "@types/node": "17.0.29",