Merge branch 'dev' into mh/cleanup

Author: mhurcs

README.md

@@ -3,7 +3,7 @@ Welcome to DenoGres! A new comprehensive ORM for PostgreSQL and Deno.
 
 ## Getting Started
 To begin, let's download DenoGres! Execute the below in the terminal - this will give you access to DenoGres's CLI functionality.
->`deno install --allow-read --allow-write --allow-net --allow-env --name denogres https://raw.githubusercontent.com/oslabs-beta/DenoGres/dev/mod.ts`
+>`deno install --allow-read --allow-write --allow-net --allow-env --name denogres https://deno.land/x/denogres/mod.ts`
 
 After installation is complete, ensure deno is added to PATH.
 
@@ -26,4 +26,7 @@ DenoGres includes some functionality that is still in development - including da
 >`denogres --db-sync`
 
 ## Documents
-More information on how to use DenoGres and leverage all its wonderful abstraction functionality can be found here: https://denogres.deno.dev/
+More information on how to use DenoGres and leverage all its wonderful abstraction functionality can be found here: https://denogres.deno.dev/
+
+## License
+MIT

Test/dbPull.ts

@@ -2,7 +2,7 @@ import { assert } from './deps.ts';
 import { dbPull } from '../src/functions/dbPull.ts';
 
 const generatedModel = 
-`import { Model } from 'https://raw.githubusercontent.com/oslabs-beta/DenoGres/dev/mod.ts'
+`import { Model } from 'https://deno.land/x/denogres/mod.ts'
 // user model definition comes here
 
 

mod.ts

@@ -12,9 +12,6 @@ switch(Deno.args[0]) {
         break;
 
     case '--db-pull': {// introspection begins
-        // Check for database URI
-        // Deno.env.set(URI, value)
-        // Deno.env.get(URI)
         const envVar = parse(await Deno.readTextFile('./.env')); // Get DB_URI
 
         if(envVar.DATABASE_URI === "") {
@@ -35,7 +32,6 @@ switch(Deno.args[0]) {
 
 function displayHelpMsg() {
   return `flags:
--h, --help: display help message
 --init: set-up DenoGres required files
 --db-pull: Introspect database and create and populate model.ts file`;
 }

models/model.ts

@@ -6,7 +6,7 @@ import { introspect } from './introspect.ts'
 export async function dbPull() {
     const [tableListObj, enumObj] = await introspect();
 
-    let autoCreatedModels = `import { Model } from 'https://raw.githubusercontent.com/oslabs-beta/DenoGres/dev/mod.ts'\n// user model definition comes here\n\n`;
+    let autoCreatedModels = `import { Model } from 'https://deno.land/x/denogres/mod.ts'\n// user model definition comes here\n\n`;
 
     // iterate over the properties of tableListObj
     Object.keys(tableListObj).forEach(el => {

src/functions/dbPull.ts

@@ -2,7 +2,7 @@ export const enumParser = (): Record<string, unknown[]> => {
     const modelText = Deno.readTextFileSync('./models/model.ts');
 
     const enumText = modelText.replaceAll(/export interface \w+ {[\n +\w+: \w+]+}/g, '').
-            replaceAll("import { Model } from 'https://raw.githubusercontent.com/oslabs-beta/DenoGres/dev/mod.ts'\n", ''). // initial wording
+            replaceAll("import { Model } from 'https://deno.land/x/denogres/mod.ts'\n", ''). // initial wording
             replaceAll(/\/\/ user model definition comes here\n+/g, '').
             replaceAll(/\n */g, '').
             matchAll(/export enum \w+ {[\n *\w+\,*]+}/g) // remove enums for now, will need different logic to parse these

src/functions/enumParser.ts

@@ -1,4 +1,4 @@
-import { ensureDir } from "../..//deps.ts";
+import { ensureDir } from "../../deps.ts";
 
 export function init() {
 // create .env file in root directory 
@@ -22,7 +22,7 @@ TEST_DB_URI=" "
 // inside the model folder, create model.ts file with boilerplate code
     const modelFilePath = "./models/";
     const modelFileContent = `    
-import { Model } from 'https://raw.githubusercontent.com/oslabs-beta/DenoGres/dev/mod.ts'
+import { Model } from 'https://deno.land/x/denogres/mod.ts'
 // user model definition comes here    
     `
     ensureDir(modelFilePath).then(() => {

src/functions/init.ts

@@ -25,7 +25,7 @@ export interface ModelInfo {
 export const modelParser = (): ModelInfo[] => {
     const modelText = Deno.readTextFileSync('./models/model.ts');
 const cleanedText = modelText.replaceAll(/export interface \w+ *\{[\n* *.*: \w+,*]+\}/g, '').
-            replaceAll("import { Model } from 'https://raw.githubusercontent.com/oslabs-beta/DenoGres/dev/mod.ts'\n", ''). // initial wording
+            replaceAll("import { Model } from 'https://deno.land/x/denogres/mod.ts'\n", ''). // initial wording
             replaceAll(/\/\/ user model definition comes here\n+/g, '').
             replaceAll(/\n */g, '').
             replaceAll(/export enum \w+ {[\n *\w+\,*]+}/g, '') // remove enums for now, will need different logic to parse these