chore: import文の書き方を変更 (#78)

* importの書き方を変更

* code format

* importの生成処理を変更

* code format

* import文を修正

* providerの生成処理を修正

* import文を修正

* import文を修正

* Add ignore

* Add task

* Fix CI

* Fix test

* Rename

* Fix test

* Fix test

* Code format

* Fix test

* Remove unused

* bump patch

Author: jiro4989

.github/workflows/test.yml

@@ -32,7 +32,7 @@ jobs:
           nim-version: ${{ matrix.nim-version }}
       - run: nimble build -Y
       - run: nimble install -Y
-      - run: nimble test -Y
+      - run: nimble tests
 
   docs:
     runs-on: ubuntu-latest

.gitignore

@@ -7,3 +7,5 @@ tests/*.exe
 
 tools/generator
 !tests/testdata
+testresults/
+nimcache/

faker.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.15.1"
+version       = "0.15.2"
 author        = "jiro4989"
 description   = "faker is a Nim package that generates fake data for you."
 license       = "MIT"
@@ -20,6 +20,9 @@ requires "nim >= 1.0.0"
 let
   providerDir = "src" / "faker" / "provider"
 
+task tests, "Run test":
+  exec "testament p 'tests/test_*.nim'"
+
 task docs, "Generate API documents":
   exec "nimble doc --index:on --project --out:docs --hints:off src/faker.nim"
 

src/faker.nim

@@ -9,5 +9,8 @@ runnableExamples:
   let fake = newFaker()
   echo fake.address()
 
-import faker/[base, provider]
-export base, provider
+import ./faker/base
+import ./faker/provider
+
+export base
+export provider

src/faker/base.nim

@@ -1,4 +1,8 @@
-import random, times, os, strutils
+import std/os
+import std/random
+import std/strutils
+import std/times
+
 export random
 
 type
@@ -11,7 +15,7 @@ proc newFaker*(locale = "", seed = 0): Faker =
   # seed値で乱数を初期化。seedが0以下なら現在時刻をseed値とする
   result.rand =
     if 0 < seed: initRand(seed)
-    else: 
+    else:
       let now = times.getTime()
       initRand(convert(Seconds, Nanoseconds, now.toUnix) + now.nanosecond)
   # 言語をセット

src/faker/provider.nim

@@ -3,5 +3,32 @@
 # See 'tools/generator'.                          #
 # ----------------------------------------------- #
 
-import provider/[address, automotive, bank, company, currency, file, internet, isbn, job, lorem, misc, person, phone_number, user_agent]
-export address, automotive, bank, company, currency, file, internet, isbn, job, lorem, misc, person, phone_number, user_agent
+import provider/address
+import provider/automotive
+import provider/bank
+import provider/company
+import provider/currency
+import provider/file
+import provider/internet
+import provider/isbn
+import provider/job
+import provider/lorem
+import provider/misc
+import provider/person
+import provider/phone_number
+import provider/user_agent
+
+export address
+export automotive
+export bank
+export company
+export currency
+export file
+export internet
+export isbn
+export job
+export lorem
+export misc
+export person
+export phone_number
+export user_agent

src/faker/provider/address.nim

@@ -1,10 +1,12 @@
 # ----------------------------------------------- #
-# This module was generated by 'nimble genProvs'. #
-# See 'faker.nimble'.                             #
+# This module was generated by 'generator' tool . #
+# See 'tools/generator'.                          #
 # ----------------------------------------------- #
 
 import ../base
-import address/[address_ja_JP, address_en_US, address_fa_IR]
+import address/address_en_US
+import address/address_fa_IR
+import address/address_ja_JP
 export base
 
 proc address*(f: Faker): string =
@@ -14,9 +16,9 @@ proc address*(f: Faker): string =
     echo f.address()
 
   case f.locale
-  of "ja_JP": address_ja_JP.address(f)
   of "en_US": address_en_US.address(f)
   of "fa_IR": address_fa_IR.address(f)
+  of "ja_JP": address_ja_JP.address(f)
   else: address_en_US.address(f)
 
 proc buildingNumber*(f: Faker): string =
@@ -26,9 +28,9 @@ proc buildingNumber*(f: Faker): string =
     echo f.buildingNumber()
 
   case f.locale
-  of "ja_JP": address_ja_JP.buildingNumber(f)
   of "en_US": address_en_US.buildingNumber(f)
   of "fa_IR": address_fa_IR.buildingNumber(f)
+  of "ja_JP": address_ja_JP.buildingNumber(f)
   else: address_en_US.buildingNumber(f)
 
 proc city*(f: Faker): string =
@@ -38,9 +40,9 @@ proc city*(f: Faker): string =
     echo f.city()
 
   case f.locale
-  of "ja_JP": address_ja_JP.city(f)
   of "en_US": address_en_US.city(f)
   of "fa_IR": address_fa_IR.city(f)
+  of "ja_JP": address_ja_JP.city(f)
   else: address_en_US.city(f)
 
 proc cityPrefix*(f: Faker): string =
@@ -50,9 +52,9 @@ proc cityPrefix*(f: Faker): string =
     echo f.cityPrefix()
 
   case f.locale
-  of "ja_JP": address_ja_JP.cityPrefix(f)
   of "en_US": address_en_US.cityPrefix(f)
   of "fa_IR": address_fa_IR.cityPrefix(f)
+  of "ja_JP": address_ja_JP.cityPrefix(f)
   else: address_en_US.cityPrefix(f)
 
 proc citySuffix*(f: Faker): string =
@@ -62,9 +64,9 @@ proc citySuffix*(f: Faker): string =
     echo f.citySuffix()
 
   case f.locale
-  of "ja_JP": address_ja_JP.citySuffix(f)
   of "en_US": address_en_US.citySuffix(f)
   of "fa_IR": address_fa_IR.citySuffix(f)
+  of "ja_JP": address_ja_JP.citySuffix(f)
   else: address_en_US.citySuffix(f)
 
 proc country*(f: Faker): string =
@@ -74,9 +76,9 @@ proc country*(f: Faker): string =
     echo f.country()
 
   case f.locale
-  of "ja_JP": address_ja_JP.country(f)
   of "en_US": address_en_US.country(f)
   of "fa_IR": address_fa_IR.country(f)
+  of "ja_JP": address_ja_JP.country(f)
   else: address_en_US.country(f)
 
 proc militaryApo*(f: Faker): string =
@@ -86,9 +88,9 @@ proc militaryApo*(f: Faker): string =
     echo f.militaryApo()
 
   case f.locale
-  of "ja_JP": address_ja_JP.militaryApo(f)
   of "en_US": address_en_US.militaryApo(f)
   of "fa_IR": address_fa_IR.militaryApo(f)
+  of "ja_JP": address_ja_JP.militaryApo(f)
   else: address_en_US.militaryApo(f)
 
 proc militaryDpo*(f: Faker): string =
@@ -98,9 +100,9 @@ proc militaryDpo*(f: Faker): string =
     echo f.militaryDpo()
 
   case f.locale
-  of "ja_JP": address_ja_JP.militaryDpo(f)
   of "en_US": address_en_US.militaryDpo(f)
   of "fa_IR": address_fa_IR.militaryDpo(f)
+  of "ja_JP": address_ja_JP.militaryDpo(f)
   else: address_en_US.militaryDpo(f)
 
 proc militaryShip*(f: Faker): string =
@@ -110,9 +112,9 @@ proc militaryShip*(f: Faker): string =
     echo f.militaryShip()
 
   case f.locale
-  of "ja_JP": address_ja_JP.militaryShip(f)
   of "en_US": address_en_US.militaryShip(f)
   of "fa_IR": address_fa_IR.militaryShip(f)
+  of "ja_JP": address_ja_JP.militaryShip(f)
   else: address_en_US.militaryShip(f)
 
 proc militaryState*(f: Faker): string =
@@ -122,9 +124,9 @@ proc militaryState*(f: Faker): string =
     echo f.militaryState()
 
   case f.locale
-  of "ja_JP": address_ja_JP.militaryState(f)
   of "en_US": address_en_US.militaryState(f)
   of "fa_IR": address_fa_IR.militaryState(f)
+  of "ja_JP": address_ja_JP.militaryState(f)
   else: address_en_US.militaryState(f)
 
 proc postalcode*(f: Faker): string =
@@ -134,9 +136,9 @@ proc postalcode*(f: Faker): string =
     echo f.postalcode()
 
   case f.locale
-  of "ja_JP": address_ja_JP.postalcode(f)
   of "en_US": address_en_US.postalcode(f)
   of "fa_IR": address_fa_IR.postalcode(f)
+  of "ja_JP": address_ja_JP.postalcode(f)
   else: address_en_US.postalcode(f)
 
 proc postalcodePlus4*(f: Faker): string =
@@ -146,9 +148,9 @@ proc postalcodePlus4*(f: Faker): string =
     echo f.postalcodePlus4()
 
   case f.locale
-  of "ja_JP": address_ja_JP.postalcodePlus4(f)
   of "en_US": address_en_US.postalcodePlus4(f)
   of "fa_IR": address_fa_IR.postalcodePlus4(f)
+  of "ja_JP": address_ja_JP.postalcodePlus4(f)
   else: address_en_US.postalcodePlus4(f)
 
 proc postcode*(f: Faker): string =
@@ -158,9 +160,9 @@ proc postcode*(f: Faker): string =
     echo f.postcode()
 
   case f.locale
-  of "ja_JP": address_ja_JP.postcode(f)
   of "en_US": address_en_US.postcode(f)
   of "fa_IR": address_fa_IR.postcode(f)
+  of "ja_JP": address_ja_JP.postcode(f)
   else: address_en_US.postcode(f)
 
 proc secondaryAddress*(f: Faker): string =
@@ -170,9 +172,9 @@ proc secondaryAddress*(f: Faker): string =
     echo f.secondaryAddress()
 
   case f.locale
-  of "ja_JP": address_ja_JP.secondaryAddress(f)
   of "en_US": address_en_US.secondaryAddress(f)
   of "fa_IR": address_fa_IR.secondaryAddress(f)
+  of "ja_JP": address_ja_JP.secondaryAddress(f)
   else: address_en_US.secondaryAddress(f)
 
 proc state*(f: Faker): string =
@@ -182,9 +184,9 @@ proc state*(f: Faker): string =
     echo f.state()
 
   case f.locale
-  of "ja_JP": address_ja_JP.state(f)
   of "en_US": address_en_US.state(f)
   of "fa_IR": address_fa_IR.state(f)
+  of "ja_JP": address_ja_JP.state(f)
   else: address_en_US.state(f)
 
 proc streetAddress*(f: Faker): string =
@@ -194,9 +196,9 @@ proc streetAddress*(f: Faker): string =
     echo f.streetAddress()
 
   case f.locale
-  of "ja_JP": address_ja_JP.streetAddress(f)
   of "en_US": address_en_US.streetAddress(f)
   of "fa_IR": address_fa_IR.streetAddress(f)
+  of "ja_JP": address_ja_JP.streetAddress(f)
   else: address_en_US.streetAddress(f)
 
 proc streetName*(f: Faker): string =
@@ -206,9 +208,9 @@ proc streetName*(f: Faker): string =
     echo f.streetName()
 
   case f.locale
-  of "ja_JP": address_ja_JP.streetName(f)
   of "en_US": address_en_US.streetName(f)
   of "fa_IR": address_fa_IR.streetName(f)
+  of "ja_JP": address_ja_JP.streetName(f)
   else: address_en_US.streetName(f)
 
 proc streetSuffix*(f: Faker): string =
@@ -218,9 +220,9 @@ proc streetSuffix*(f: Faker): string =
     echo f.streetSuffix()
 
   case f.locale
-  of "ja_JP": address_ja_JP.streetSuffix(f)
   of "en_US": address_en_US.streetSuffix(f)
   of "fa_IR": address_fa_IR.streetSuffix(f)
+  of "ja_JP": address_ja_JP.streetSuffix(f)
   else: address_en_US.streetSuffix(f)
 
 proc zipcode*(f: Faker): string =
@@ -230,9 +232,9 @@ proc zipcode*(f: Faker): string =
     echo f.zipcode()
 
   case f.locale
-  of "ja_JP": address_ja_JP.zipcode(f)
   of "en_US": address_en_US.zipcode(f)
   of "fa_IR": address_fa_IR.zipcode(f)
+  of "ja_JP": address_ja_JP.zipcode(f)
   else: address_en_US.zipcode(f)
 
 proc zipcodePlus4*(f: Faker): string =
@@ -242,7 +244,7 @@ proc zipcodePlus4*(f: Faker): string =
     echo f.zipcodePlus4()
 
   case f.locale
-  of "ja_JP": address_ja_JP.zipcodePlus4(f)
   of "en_US": address_en_US.zipcodePlus4(f)
   of "fa_IR": address_fa_IR.zipcodePlus4(f)
+  of "ja_JP": address_ja_JP.zipcodePlus4(f)
   else: address_en_US.zipcodePlus4(f)

src/faker/provider/automotive.nim

@@ -4,7 +4,7 @@
 # ----------------------------------------------- #
 
 import ../base
-import automotive/[automotive_en_US]
+import automotive/automotive_en_US
 export base
 
 proc licensePlate*(f: Faker): string =

src/faker/provider/bank.nim

@@ -4,7 +4,7 @@
 # ----------------------------------------------- #
 
 import ../base
-import bank/[bank_en_US]
+import bank/bank_en_US
 export base
 
 proc bankCountry*(f: Faker): string =

src/faker/provider/bank/bank_en_US.nim

@@ -1,21 +1,10 @@
 include interfaces
 
-import tables
-from strutils import join, parseBiggestUInt
-from strformat import `&`
-from sequtils import mapIt
+from std/strformat import `&`
 
 const
   countryCode = "GB"
   bbanFormat = "????#############"
-  asciiUpperCase = {'A'..'Z'}
-
-let
-  alpha = block:
-    var tbl = initTable[char, string]()
-    for ch in asciiUpperCase:
-      tbl.add(ch, $(ch.ord mod 55))
-    tbl
 
 proc bankCountry*(f: Faker): string =
   countryCode

src/faker/provider/company.nim

@@ -4,7 +4,8 @@
 # ----------------------------------------------- #
 
 import ../base
-import company/[company_en_US, company_ja_JP]
+import company/company_en_US
+import company/company_ja_JP
 export base
 
 proc bs*(f: Faker): string =

src/faker/provider/currency.nim

@@ -4,7 +4,7 @@
 # ----------------------------------------------- #
 
 import ../base
-import currency/[currency_en_US]
+import currency/currency_en_US
 export base
 
 proc currency*(f: Faker): (string, string) =